fixed drop for IE, FF

danialfarid · Mar 27, 2014 · 36541a0 · 36541a0
1 parent a08b2a5
commit 36541a0
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 18 deletions.
diff --git a/demo/war/index.html b/demo/war/index.html
@@ -78,6 +78,6 @@ <h3>
 			</ul>
 		</div>
 	</div>
-	<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-24</div>
+	<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-27</div>
 </body>
 </html>
diff --git a/demo/war/js/angular-file-upload.js b/demo/war/js/angular-file-upload.js
@@ -208,11 +208,16 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', function($pars
 				evt.preventDefault();
 				elem.removeClass(attr['ngFileDragOverClass'] || "dragover");
 				var files = [], items = evt.dataTransfer.items;
-				for (var i = 0; i < items.length; i++) {
-					if (items[i].webkitGetAsEntry) {
+				if (items && items.length > 0 && items[0].webkitGetAsEntry) {
+					for (var i = 0; i < items.length; i++) {
 						traverseFileTree(files, items[i].webkitGetAsEntry());
-					} else {
-						files.push(items[i]);
+					}
+				} else {
+					var fileList = evt.dataTransfer.files;
+					if (fileList != null) {
+						for (var i = 0; i < fileList.length; i++) {
+							files.push(fileList.item(i));
+						}
 					}
 				}
 				(function callback(delay) {

diff --git a/dist/angular-file-upload-html5-shim.js b/dist/angular-file-upload-html5-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for angular XHR HTML5 browsers
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.3.0
+ * @version 1.3.1
  */
 if (window.XMLHttpRequest) {
 	if (window.FormData) {

diff --git a/dist/angular-file-upload-html5-shim.min.js b/dist/angular-file-upload-html5-shim.min.js
diff --git a/dist/angular-file-upload-shim.js b/dist/angular-file-upload-shim.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload shim for HTML5 FormData
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.3.0
+ * @version 1.3.1
  */
 (function() {
 

diff --git a/dist/angular-file-upload-shim.min.js b/dist/angular-file-upload-shim.min.js
diff --git a/dist/angular-file-upload.js b/dist/angular-file-upload.js
@@ -1,7 +1,7 @@
 /**!
  * AngularJS file upload/drop directive with http post and progress
  * @author  Danial  <danial.farid@gmail.com>
- * @version 1.3.0
+ * @version 1.3.1
  */
 (function() {
 
@@ -208,11 +208,16 @@ angularFileUpload.directive('ngFileDrop', [ '$parse', '$timeout', function($pars
 				evt.preventDefault();
 				elem.removeClass(attr['ngFileDragOverClass'] || "dragover");
 				var files = [], items = evt.dataTransfer.items;
-				for (var i = 0; i < items.length; i++) {
-					if (items[i].webkitGetAsEntry) {
+				if (items && items.length > 0 && items[0].webkitGetAsEntry) {
+					for (var i = 0; i < items.length; i++) {
 						traverseFileTree(files, items[i].webkitGetAsEntry());
-					} else {
-						files.push(items[i]);
+					}
+				} else {
+					var fileList = evt.dataTransfer.files;
+					if (fileList != null) {
+						for (var i = 0; i < fileList.length; i++) {
+							files.push(fileList.item(i));
+						}
 					}
 				}
 				(function callback(delay) {

diff --git a/dist/angular-file-upload.min.js b/dist/angular-file-upload.min.js
diff --git a/nuget/Package.nuspec b/nuget/Package.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>angular-file-upload</id>
     <title>Angular file upload</title>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <authors>Danial Farid, Georgios Diamantopoulos (nuget package)</authors>
     <owners>Danial Farid</owners>
     <licenseUrl>https://github.com/danialfarid/angular-file-upload/blob/master/LICENSE</licenseUrl>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-file-upload",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "~0.2.7",
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,6 @@ <h3> @@
     			</ul>
     		</div>
     	</div>
-    	<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-24</div>
+    	<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-27</div>
     </body>
     </html>