Merge branch 'MDL-72223' of https://github.com/paulholden/moodle

moodle · Aug 30, 2021 · a926f52 · a926f52
2 parents 483bc93 + 2661214
commit a926f52
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 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
@@ -203,7 +203,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             }
         } else {
             // User is selecting some text before clicking on the Link button.
-            textToDisplay = Y.one(selectednode).get('textContent');
+            textToDisplay = window.getSelection().toString();
             if (textToDisplay !== '') {
                 this._hasTextToDisplay = true;
                 this._content.one(SELECTORS.URLTEXT).set('value', textToDisplay);

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
@@ -203,7 +203,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             }
         } else {
             // User is selecting some text before clicking on the Link button.
-            textToDisplay = Y.one(selectednode).get('textContent');
+            textToDisplay = window.getSelection().toString();
             if (textToDisplay !== '') {
                 this._hasTextToDisplay = true;
                 this._content.one(SELECTORS.URLTEXT).set('value', textToDisplay);

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
@@ -201,7 +201,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit
             }
         } else {
             // User is selecting some text before clicking on the Link button.
-            textToDisplay = Y.one(selectednode).get('textContent');
+            textToDisplay = window.getSelection().toString();
             if (textToDisplay !== '') {
                 this._hasTextToDisplay = true;
                 this._content.one(SELECTORS.URLTEXT).set('value', textToDisplay);