Merge branch 'MDL-49107-27' of git://github.com/FMCorz/moodle into MO…

…ODLE_27_STABLE
moodle · Mar 10, 2015 · 28a3365 · 28a3365
2 parents 154356e + ac5e89c
commit 28a3365
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 45 deletions.
diff --git a/...itor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/...itor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
@@ -111,7 +111,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     _displayDialogue: function() {
         // Store the current selection.
         this._currentSelection = this.get('host').getSelection();
-        if (this._currentSelection === false || this._currentSelection.collapsed) {
+        if (this._currentSelection === false) {
             return;
         }
 
@@ -167,11 +167,11 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     },
 
     /**
-     * Update the dialogue after an image was selected in the File Picker.
+     * Update the dialogue after a link was selected in the File Picker.
      *
      * @method _filepickerCallback
      * @param {object} params The parameters provided by the filepicker
-     * containing information about the image.
+     * containing information about the link.
      * @private
      */
     _filepickerCallback: function(params) {
@@ -180,9 +180,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
                 .hide();
 
         if (params.url !== '') {
-            this.get('host').setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, params.url);
+            // Add the link.
+            this._setLinkOnSelection(params.url);
+
             // And mark the text area as updated.
             this.markUpdated();
         }
@@ -202,8 +202,6 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             anchornodes,
             value;
 
-        var host = this.get('host');
-
         e.preventDefault();
         this.getDialogue({
             focusAfterHide: null
@@ -213,13 +211,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
 
         value = input.get('value');
         if (value !== '') {
-            this.editor.focus();
-            host.setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, value);
 
-            // Now set the target.
-            selectednode = host.getSelectionParentNode();
+            // Add the link.
+            selectednode = this._setLinkOnSelection(value);
 
             // Note this is a document fragment and YUI doesn't like them.
             if (!selectednode) {
@@ -240,6 +234,41 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         }
     },
 
+    /**
+     * Final step setting the anchor on the selection.
+     *
+     * @private
+     * @method _setLinkOnSelection
+     * @param  {String} url URL the link will point to.
+     * @return {Node} The added Node.
+     */
+    _setLinkOnSelection: function(url) {
+        var host = this.get('host'),
+            link,
+            selectednode;
+
+        this.editor.focus();
+        host.setSelection(this._currentSelection);
+
+        if (this._currentSelection[0].collapsed) {
+            // Firefox cannot add links when the selection is empty so we will add it manually.
+            link = Y.Node.create('<a>' + url + '</a>');
+            link.setAttribute('href', url);
+
+            // Add the node and select it to replicate the behaviour of execCommand.
+            selectednode = host.insertContentAtFocusPoint(link.get('outerHTML'));
+            host.setSelection(host.getSelectionFromNode(selectednode));
+        } else {
+            document.execCommand('unlink', false, null);
+            document.execCommand('createLink', false, url);
+
+            // Now set the target.
+            selectednode = host.getSelectionParentNode();
+        }
+
+        return selectednode;
+    },
+
     /**
      * Look up and down for the nearest anchor tags that are least partly contained in the selection.
      *

diff --git a/...editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/...editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
@@ -111,7 +111,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     _displayDialogue: function() {
         // Store the current selection.
         this._currentSelection = this.get('host').getSelection();
-        if (this._currentSelection === false || this._currentSelection.collapsed) {
+        if (this._currentSelection === false) {
             return;
         }
 
@@ -167,11 +167,11 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     },
 
     /**
-     * Update the dialogue after an image was selected in the File Picker.
+     * Update the dialogue after a link was selected in the File Picker.
      *
      * @method _filepickerCallback
      * @param {object} params The parameters provided by the filepicker
-     * containing information about the image.
+     * containing information about the link.
      * @private
      */
     _filepickerCallback: function(params) {
@@ -180,9 +180,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
                 .hide();
 
         if (params.url !== '') {
-            this.get('host').setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, params.url);
+            // Add the link.
+            this._setLinkOnSelection(params.url);
+
             // And mark the text area as updated.
             this.markUpdated();
         }
@@ -202,8 +202,6 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             anchornodes,
             value;
 
-        var host = this.get('host');
-
         e.preventDefault();
         this.getDialogue({
             focusAfterHide: null
@@ -213,13 +211,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
 
         value = input.get('value');
         if (value !== '') {
-            this.editor.focus();
-            host.setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, value);
 
-            // Now set the target.
-            selectednode = host.getSelectionParentNode();
+            // Add the link.
+            selectednode = this._setLinkOnSelection(value);
 
             // Note this is a document fragment and YUI doesn't like them.
             if (!selectednode) {
@@ -240,6 +234,41 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         }
     },
 
+    /**
+     * Final step setting the anchor on the selection.
+     *
+     * @private
+     * @method _setLinkOnSelection
+     * @param  {String} url URL the link will point to.
+     * @return {Node} The added Node.
+     */
+    _setLinkOnSelection: function(url) {
+        var host = this.get('host'),
+            link,
+            selectednode;
+
+        this.editor.focus();
+        host.setSelection(this._currentSelection);
+
+        if (this._currentSelection[0].collapsed) {
+            // Firefox cannot add links when the selection is empty so we will add it manually.
+            link = Y.Node.create('<a>' + url + '</a>');
+            link.setAttribute('href', url);
+
+            // Add the node and select it to replicate the behaviour of execCommand.
+            selectednode = host.insertContentAtFocusPoint(link.get('outerHTML'));
+            host.setSelection(host.getSelectionFromNode(selectednode));
+        } else {
+            document.execCommand('unlink', false, null);
+            document.execCommand('createLink', false, url);
+
+            // Now set the target.
+            selectednode = host.getSelectionParentNode();
+        }
+
+        return selectednode;
+    },
+
     /**
      * Look up and down for the nearest anchor tags that are least partly contained in the selection.
      *

diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js
@@ -109,7 +109,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     _displayDialogue: function() {
         // Store the current selection.
         this._currentSelection = this.get('host').getSelection();
-        if (this._currentSelection === false || this._currentSelection.collapsed) {
+        if (this._currentSelection === false) {
             return;
         }
 
@@ -165,11 +165,11 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
     },
 
     /**
-     * Update the dialogue after an image was selected in the File Picker.
+     * Update the dialogue after a link was selected in the File Picker.
      *
      * @method _filepickerCallback
      * @param {object} params The parameters provided by the filepicker
-     * containing information about the image.
+     * containing information about the link.
      * @private
      */
     _filepickerCallback: function(params) {
@@ -178,9 +178,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
                 .hide();
 
         if (params.url !== '') {
-            this.get('host').setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, params.url);
+            // Add the link.
+            this._setLinkOnSelection(params.url);
+
             // And mark the text area as updated.
             this.markUpdated();
         }
@@ -200,8 +200,6 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             anchornodes,
             value;
 
-        var host = this.get('host');
-
         e.preventDefault();
         this.getDialogue({
             focusAfterHide: null
@@ -211,13 +209,9 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
 
         value = input.get('value');
         if (value !== '') {
-            this.editor.focus();
-            host.setSelection(this._currentSelection);
-            document.execCommand('unlink', false, null);
-            document.execCommand('createLink', false, value);
 
-            // Now set the target.
-            selectednode = host.getSelectionParentNode();
+            // Add the link.
+            selectednode = this._setLinkOnSelection(value);
 
             // Note this is a document fragment and YUI doesn't like them.
             if (!selectednode) {
@@ -238,6 +232,41 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
         }
     },
 
+    /**
+     * Final step setting the anchor on the selection.
+     *
+     * @private
+     * @method _setLinkOnSelection
+     * @param  {String} url URL the link will point to.
+     * @return {Node} The added Node.
+     */
+    _setLinkOnSelection: function(url) {
+        var host = this.get('host'),
+            link,
+            selectednode;
+
+        this.editor.focus();
+        host.setSelection(this._currentSelection);
+
+        if (this._currentSelection[0].collapsed) {
+            // Firefox cannot add links when the selection is empty so we will add it manually.
+            link = Y.Node.create('<a>' + url + '</a>');
+            link.setAttribute('href', url);
+
+            // Add the node and select it to replicate the behaviour of execCommand.
+            selectednode = host.insertContentAtFocusPoint(link.get('outerHTML'));
+            host.setSelection(host.getSelectionFromNode(selectednode));
+        } else {
+            document.execCommand('unlink', false, null);
+            document.execCommand('createLink', false, url);
+
+            // Now set the target.
+            selectednode = host.getSelectionParentNode();
+        }
+
+        return selectednode;
+    },
+
     /**
      * Look up and down for the nearest anchor tags that are least partly contained in the selection.
      *

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -1361,6 +1361,7 @@ EditorSelection.prototype = {
      *
      * @method insertContentAtFocusPoint
      * @param {String} html
+     * @return {Node} The YUI Node object added to the DOM.
      */
     insertContentAtFocusPoint: function(html) {
         var selection = rangy.getSelection(),
@@ -1373,6 +1374,7 @@ EditorSelection.prototype = {
             range.deleteContents();
             range.insertNode(node.getDOMNode());
         }
+        return node;
     }
 
 };