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

lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js

@@ -1024,7 +1024,7 @@ EditorSelection.prototype = {
         }
 
         // We can't be active if the editor doesn't have focus at the moment.
-        if (!document.activeElement || document.activeElement !== this.editor) {
+        if (!document.activeElement || Y.one(document.activeElement) !== this.editor) {
             return false;
         }
 

lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js

@@ -1019,7 +1019,7 @@ EditorSelection.prototype = {
         }
 
         // We can't be active if the editor doesn't have focus at the moment.
-        if (!document.activeElement || document.activeElement !== this.editor) {
+        if (!document.activeElement || Y.one(document.activeElement) !== this.editor) {
             return false;
         }
 

lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js

@@ -751,7 +751,11 @@ EditorPluginButtons.prototype = {
             return;
         }
 
-        if (!this.get('host').isActive()) {
+        if (!(YUI.Env.UA.android || this.get('host').isActive())) {
+            // We must not focus for Android here, even if the editor is not active because the keyboard auto-completion
+            // changes the cursor position.
+            // If we save that change, then when we restore the change later we get put in the wrong place.
+            // Android is fine to save the selection without the editor being in focus.
             this.get('host').focus();
         }
 

lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js

@@ -749,7 +749,11 @@ EditorPluginButtons.prototype = {
             return;
         }
 
-        if (!this.get('host').isActive()) {
+        if (!(YUI.Env.UA.android || this.get('host').isActive())) {
+            // We must not focus for Android here, even if the editor is not active because the keyboard auto-completion
+            // changes the cursor position.
+            // If we save that change, then when we restore the change later we get put in the wrong place.
+            // Android is fine to save the selection without the editor being in focus.
             this.get('host').focus();
         }
 

lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js

@@ -602,7 +602,11 @@ EditorPluginButtons.prototype = {
             return;
         }
 
-        if (!this.get('host').isActive()) {
+        if (!(YUI.Env.UA.android || this.get('host').isActive())) {
+            // We must not focus for Android here, even if the editor is not active because the keyboard auto-completion
+            // changes the cursor position.
+            // If we save that change, then when we restore the change later we get put in the wrong place.
+            // Android is fine to save the selection without the editor being in focus.
             this.get('host').focus();
         }
 

lib/editor/atto/yui/src/editor/js/selection.js

@@ -121,7 +121,7 @@ EditorSelection.prototype = {
         }
 
         // We can't be active if the editor doesn't have focus at the moment.
-        if (!document.activeElement || document.activeElement !== this.editor) {
+        if (!document.activeElement || Y.one(document.activeElement) !== this.editor) {
             return false;
         }