L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Thies
2014-11-14 11:49:15 -06:00
parent c106341098
commit 9b9a3abf9b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
Vendored
+2 -1
View File
@@ -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;
}
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
Vendored
+2 -1
View File
@@ -1523,7 +1523,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;
}
lib/editor/atto/yui/src/editor/js/selection.js
Vendored
+2 -1
View File
@@ -121,7 +121,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;
}