Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

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

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

@@ -96,6 +96,11 @@ Y.extend(EditorPlugin, Y.Base, {
      * @method markUpdated
      */
     markUpdated: function() {
+        // Save selection after changes to the DOM. If you don't do this here,
+        // subsequent calls to restoreSelection() will fail expecting the
+        // previous DOM state.
+        this.get('host').saveSelection();
+
         return this.get('host').updateOriginal();
     }
 }, {
@@ -747,6 +752,9 @@ EditorPluginButtons.prototype = {
         // Build the arguments list, but remove the callback we're calling.
         var args = [e, callbackArgs];
 
+        // Restore selection before making changes.
+        this.get('host').restoreSelection();
+
         // Actually call the callback now.
         return callback.apply(this, args);
     },

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

@@ -96,6 +96,11 @@ Y.extend(EditorPlugin, Y.Base, {
      * @method markUpdated
      */
     markUpdated: function() {
+        // Save selection after changes to the DOM. If you don't do this here,
+        // subsequent calls to restoreSelection() will fail expecting the
+        // previous DOM state.
+        this.get('host').saveSelection();
+
         return this.get('host').updateOriginal();
     }
 }, {
@@ -745,6 +750,9 @@ EditorPluginButtons.prototype = {
         // Build the arguments list, but remove the callback we're calling.
         var args = [e, callbackArgs];
 
+        // Restore selection before making changes.
+        this.get('host').restoreSelection();
+
         // Actually call the callback now.
         return callback.apply(this, args);
     },

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

@@ -604,6 +604,9 @@ EditorPluginButtons.prototype = {
         // Build the arguments list, but remove the callback we're calling.
         var args = [e, callbackArgs];
 
+        // Restore selection before making changes.
+        this.get('host').restoreSelection();
+
         // Actually call the callback now.
         return callback.apply(this, args);
     },

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

@@ -94,6 +94,11 @@ Y.extend(EditorPlugin, Y.Base, {
      * @method markUpdated
      */
     markUpdated: function() {
+        // Save selection after changes to the DOM. If you don't do this here,
+        // subsequent calls to restoreSelection() will fail expecting the
+        // previous DOM state.
+        this.get('host').saveSelection();
+
         return this.get('host').updateOriginal();
     }
 }, {