Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 47c344134812 · 2012-11-29T21:27:58.000+01:00
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.19.5
+ * jQuery File Upload Plugin 5.19.6
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -971,7 +971,7 @@
             if (this._trigger('dragover', e) === false) {
                 return false;
             }
-            if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1) {
                 dataTransfer.dropEffect = 'copy';
                 e.preventDefault();
             }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * jQuery File Upload Plugin 5.19.5`
	`2`	`+ * jQuery File Upload Plugin 5.19.6`
`3`	`3`	`* https://github.com/blueimp/jQuery-File-Upload`
`4`	`4`	`*`
`5`	`5`	`* Copyright 2010, Sebastian Tschan`
`@@ -971,7 +971,7 @@`
`971`	`971`	`if (this._trigger('dragover', e) === false) {`
`972`	`972`	`return false;`
`973`	`973`	`}`
`974`		`- if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {`
	`974`	`+ if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1) {`
`975`	`975`	`dataTransfer.dropEffect = 'copy';`
`976`	`976`	`e.preventDefault();`
`977`	`977`	`}`