MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty

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
index 41e70be..351c557 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js differ

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 78e612e..25775ee 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js differ

diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index f73e64a..a7d2225 100644 (file)
Binary files a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js and b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js differ

diff --git a/lib/editor/atto/yui/src/editor/js/selection.js b/lib/editor/atto/yui/src/editor/js/selection.js
index 99b46b8..f6d10ce 100644 (file)
--- a/lib/editor/atto/yui/src/editor/js/selection.js
+++ b/lib/editor/atto/yui/src/editor/js/selection.js
@@ -252,8 +252,12 @@ EditorSelection.prototype = {
         }
 
         if (range.collapsed) {
-            range = range.cloneRange();
-            range.selectNode(range.commonAncestorContainer);
+            // We do not want to select all the nodes in the editor if we managed to
+            // have a collapsed selection directly in the editor.
+            if (range.commonAncestorContainer !== this.editor.getDOMNode()) {
+                range = range.cloneRange();
+                range.selectNode(range.commonAncestorContainer);
+            }
         }
 
         nodes = range.getNodes();