Merge branch 'MDL-47060-master' of git://github.com/damyon/moodle

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

@@ -539,7 +539,7 @@ EditorNotify.prototype = {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
 
             this.messageOverlay.hide(true);
-            this._wrapper.append(this.messageOverlay);
+            this.textarea.get('parentNode').append(this.messageOverlay);
 
             this.messageOverlay.on('click', function() {
                 this.messageOverlay.hide(true);
@@ -919,7 +919,10 @@ EditorAutosave.prototype = {
      * @chainable
      */
     saveDraft: function() {
-        this.updateOriginal();
+        // Only copy the text from the div to the textarea if the textarea is not currently visible.
+        if (!this.editor.get('hidden')) {
+            this.updateOriginal();
+        }
         var newText = this.textarea.get('value');
 
         if (newText !== this.lastText) {

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

@@ -536,7 +536,7 @@ EditorNotify.prototype = {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
 
             this.messageOverlay.hide(true);
-            this._wrapper.append(this.messageOverlay);
+            this.textarea.get('parentNode').append(this.messageOverlay);
 
             this.messageOverlay.on('click', function() {
                 this.messageOverlay.hide(true);
@@ -913,7 +913,10 @@ EditorAutosave.prototype = {
      * @chainable
      */
     saveDraft: function() {
-        this.updateOriginal();
+        // Only copy the text from the div to the textarea if the textarea is not currently visible.
+        if (!this.editor.get('hidden')) {
+            this.updateOriginal();
+        }
         var newText = this.textarea.get('value');
 
         if (newText !== this.lastText) {

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

@@ -215,7 +215,10 @@ EditorAutosave.prototype = {
      * @chainable
      */
     saveDraft: function() {
-        this.updateOriginal();
+        // Only copy the text from the div to the textarea if the textarea is not currently visible.
+        if (!this.editor.get('hidden')) {
+            this.updateOriginal();
+        }
         var newText = this.textarea.get('value');
 
         if (newText !== this.lastText) {

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

@@ -84,7 +84,7 @@ EditorNotify.prototype = {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
 
             this.messageOverlay.hide(true);
-            this._wrapper.append(this.messageOverlay);
+            this.textarea.get('parentNode').append(this.messageOverlay);
 
             this.messageOverlay.on('click', function() {
                 this.messageOverlay.hide(true);