MDL-48064 atto_editor: Check if activeElement is child node in isActive

abgreeve · Nov 14, 2014 · 9b9a3ab · 9b9a3ab
1 parent c106341
commit 9b9a3ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
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
@@ -1535,7 +1535,8 @@ EditorSelection.prototype = {
         }
 
         // We can't be active if the editor doesn't have focus at the moment.
-        if (!document.activeElement || Y.one(document.activeElement) !== this.editor) {
+        if (!document.activeElement ||
+                !(this.editor.compareTo(document.activeElement) || this.editor.contains(document.activeElement))) {
             return false;
         }