Merge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle

moodle · Apr 30, 2014 · da8a720 · da8a720
2 parents 4b1e2c5 + 05a7f9e
commit da8a720
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
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
@@ -1001,6 +1001,11 @@ EditorSelection.prototype = {
             return false;
         }
 
+        // We can't be active if the editor doesn't have focus at the moment.
+        if (!document.activeElement || document.activeElement !== this.editor) {
+            return false;
+        }
+
         // Check whether the range intersects the editor selection.
         range.selectNode(this.editor.getDOMNode());
         return range.intersectsRange(selection.getRangeAt(0));

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
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
@@ -996,6 +996,11 @@ EditorSelection.prototype = {
             return false;
         }
 
+        // We can't be active if the editor doesn't have focus at the moment.
+        if (!document.activeElement || document.activeElement !== this.editor) {
+            return false;
+        }
+
         // Check whether the range intersects the editor selection.
         range.selectNode(this.editor.getDOMNode());
         return range.intersectsRange(selection.getRangeAt(0));

diff --git a/lib/editor/atto/yui/src/editor/js/selection.js b/lib/editor/atto/yui/src/editor/js/selection.js
@@ -108,6 +108,11 @@ EditorSelection.prototype = {
             return false;
         }
 
+        // We can't be active if the editor doesn't have focus at the moment.
+        if (!document.activeElement || document.activeElement !== this.editor) {
+            return false;
+        }
+
         // Check whether the range intersects the editor selection.
         range.selectNode(this.editor.getDOMNode());
         return range.intersectsRange(selection.getRangeAt(0));