Merge branch 'MDL-48973_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE

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

@@ -293,6 +293,21 @@ Y.extend(Editor, Y.Base, {
     setupAutomaticPolling: function() {
         this._registerEventHandle(this.editor.on(['keyup', 'paste', 'cut'], this.updateOriginal, this));
 
+        // Call this.updateOriginal after dropped content has been processed.
+        this._registerEventHandle(this.editor.on('drop', this.updateOriginalDelayed, this));
+
+        return this;
+    },
+
+    /**
+     * Calls updateOriginal on a short timer to allow native event handlers to run first.
+     *
+     * @method updateOriginalDelayed
+     * @chainable
+     */
+    updateOriginalDelayed: function() {
+        Y.soon(Y.bind(this.updateOriginal, this));
+
         return this;
     },
 

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

@@ -291,6 +291,21 @@ Y.extend(Editor, Y.Base, {
     setupAutomaticPolling: function() {
         this._registerEventHandle(this.editor.on(['keyup', 'paste', 'cut'], this.updateOriginal, this));
 
+        // Call this.updateOriginal after dropped content has been processed.
+        this._registerEventHandle(this.editor.on('drop', this.updateOriginalDelayed, this));
+
+        return this;
+    },
+
+    /**
+     * Calls updateOriginal on a short timer to allow native event handlers to run first.
+     *
+     * @method updateOriginalDelayed
+     * @chainable
+     */
+    updateOriginalDelayed: function() {
+        Y.soon(Y.bind(this.updateOriginal, this));
+
         return this;
     },
 

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

@@ -291,6 +291,21 @@ Y.extend(Editor, Y.Base, {
     setupAutomaticPolling: function() {
         this._registerEventHandle(this.editor.on(['keyup', 'paste', 'cut'], this.updateOriginal, this));
 
+        // Call this.updateOriginal after dropped content has been processed.
+        this._registerEventHandle(this.editor.on('drop', this.updateOriginalDelayed, this));
+
+        return this;
+    },
+
+    /**
+     * Calls updateOriginal on a short timer to allow native event handlers to run first.
+     *
+     * @method updateOriginalDelayed
+     * @chainable
+     */
+    updateOriginalDelayed: function() {
+        Y.soon(Y.bind(this.updateOriginal, this));
+
         return this;
     },