Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle

moodle · Apr 26, 2016 · 8bfd0e6 · 8bfd0e6
2 parents 29752d0 + c3c3c9f
commit 8bfd0e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -219,6 +219,10 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
         this.editor.delegate('dblclick', this._displayDialogue, 'img', this);
         this.editor.delegate('click', this._handleClick, 'img', this);
         this.editor.on('drop', this._handleDragDrop, this);
+
+        // e.preventDefault needed to stop the default event from clobbering the desired behaviour in some browsers.
+        this.editor.on('dragover', function(e){e.preventDefault();}, this);
+        this.editor.on('dragenter', function(e){e.preventDefault();}, this);
     },
 
     /**