Merge branch 'MDL-44270' of git://github.com/jonof/moodle

2014-04-22 09:18:20 +12:00
parent c6d1088db0 6b2b72d6f9
commit e237b23ebf
1 changed files with 4 additions and 1 deletions
@@ -355,7 +355,10 @@ M.form_dndupload.init = function(Y, options) {
         * @return boolean true if event has files
         */
        has_files: function(e) {
-            var types = e._event.dataTransfer.types;
+            // In some browsers, dataTransfer.types may be null for a
+            // 'dragover' event, so ensure a valid Array is always
+            // inspected.
+            var types = e._event.dataTransfer.types || [];
            for (var i=0; i<types.length; i++) {
                if (types[i] == 'Files') {
                    return true;