fixed #1280

danialfarid · Jan 17, 2016 · 0ae00fb · ruslan5t · Jan 28, 2016 · danialfarid
1 parent 1db5c2f
commit 0ae00fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/drop.js b/src/drop.js
@@ -313,7 +313,7 @@
       $q.all(promises).then(function () {
         if (!multiple) {
           var i = 0;
-          while (files[i].type === 'directory') i++;
+          while (files.length && files[i].type === 'directory') i++;
           defer.resolve([files[i]]);
         } else {
             defer.resolve(files);

diff --git a/src/upload.js b/src/upload.js
@@ -27,7 +27,7 @@ ngFileUpload.version = '<%= pkg.version %>';
 
 ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http, $q, $timeout) {
   var upload = this;
-  upload.promises = [];
+  upload.promisesCount = 0;
 
   this.isResumeSupported = function () {
     return window.Blob && (window.Blob instanceof Function) && new window.Blob().slice;
@@ -172,18 +172,15 @@ ngFileUpload.service('UploadBase', ['$http', '$q', '$timeout', function ($http,
       return promise;
     };
 
-    upload.promises.push(promise);
+    upload.promisesCount++;
     promise['finally'](function () {
-      var i = upload.promises.indexOf(promise);
-      if (i > -1) {
-        upload.promises.splice(i, 1);
-      }
+      upload.promisesCount--;
     });
     return promise;
   }
 
   this.isUploadInProgress = function() {
-    return upload.promises.length > 0;
+    return upload.promisesCount > 0;
   };
 
   this.rename = function (file, name) {