Merge branch 'MDL-48973_28' of https://github.com/pauln/moodle into M…

…OODLE_28_STABLE
moodle · Feb 17, 2015 · 7f8ae8f · 7f8ae8f
2 parents f5a176c + 10a382f
commit 7f8ae8f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -299,6 +299,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;
     },