Changeset 1271

Timestamp:

11/15/10 16:15:48 (3 years ago)

Author:

ejucovy

Message:

Fix editor._createLink confusion, closes ticket:1553

• editor.execCommand("createlink") is now the standard way to trigger a link-creation action
  
• under the hood, this calls an editor._createLink method
  
• core itself doesn't define editor._createLink -- instead, modules/CreateLink or plugins/Linker defines that method
  
• double-clicking on an existing link to edit that link now works
  

It is also possible to trigger a link-edit action independent of the cursor position/selection.
The way to do this is editor.execCommand("createlink", false, anchorEl)

Location:

trunk

Files:

• XinhaCore.js (modified) (2 diffs)
• modules/CreateLink/link.js (modified) (1 diff)
• plugins/DoubleClick/DoubleClick.js (modified) (1 diff)
• plugins/Linker/Linker.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -1155 +1155 @@
 
     inserthorizontalrule: [ "Horizontal Rule", ["ed_buttons_main.png",6,0], false, function(e) { e.execCommand("inserthorizontalrule"); } ],
-    createlink: [ "Insert Web Link", ["ed_buttons_main.png",6,1], false, function(e) { e._createLink(); } ],
+    createlink: [ "Insert Web Link", ["ed_buttons_main.png",6,1], false, function(e) { e.execCommand("createlink"); } ],
     insertimage: [ "Insert/Modify Image", ["ed_buttons_main.png",6,3], false, function(e) { e.execCommand("insertimage"); } ],
     inserttable: [ "Insert Table", ["ed_buttons_main.png",6,2], false, function(e) { e.execCommand("inserttable"); } ],
@@ -1184 +1184 @@
   this.dblclickList = 
   {
-    "a": [function(e, target) {e._createLink(target);}],
+      "a": [function(e, target) {e.execCommand("createlink", false, target);}],
     "img": [function(e, target) {e._insertImage(target);}]
   };

trunk/modules/CreateLink/link.js

@@ -29 +29 @@
         var self = this;
 
-   editor.config.btnList.createlink[3] = function() { self.show(self._getSelectedAnchor()); }
+        if(typeof editor._createLink == 'undefined') {
+            editor._createLink = function(target) {
+                if(!target) target = self._getSelectedAnchor();
+                self.show(target);
+            }
+        }
 }
 

trunk/plugins/DoubleClick/DoubleClick.js

@@ -38 +38 @@
   this.editor.dblClickList = {
     // Edit Link dialog
-    a: [ function(e) {e.config.btnList['createlink'][3](e); } ],
+    a: [ function(e, target) {e.execCommand("createlink", false, target);} ],
     // Follow link
     //a: [ function(editor, target) { window.location = target.href; properties(target); } ],

trunk/plugins/Linker/Linker.js

@@ -32 +32 @@
 
   var linker = this;
-  if(editor.config.btnList.createlink)
-  {
-    editor.config.btnList.createlink[3]
-      =  function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); };
+  if(typeof editor._createLink == 'undefined') {
+      editor._createLink = function(target) {
+          if(!target) target = linker._getSelectedAnchor();
+          linker._createLink(target);
+      }
   }
-  else
+  if(!editor.config.btnList.createlink)
   {
     editor.config.registerButton(
                                  'createlink', 'Insert/Modify Hyperlink', [_editor_url + "images/ed_buttons_main.gif",6,1], false,
-                                 function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); }
+                                 function(e, objname, obj) { editor.execCommand("createlink"); }
                                  );
   }