Updated: FileUploader.prototype.addToQueue, FileUploader.FileLikeObject, FileUploader.FileItem

Added: FileUploader.prototype.isArrayLikeObject,
Removed: FileUploader.prototype._getFileOrFileLikeObject

Author: nervgh

angular-file-upload.js

@@ -1,5 +1,5 @@
 /*
- angular-file-upload v1.0.3
+ angular-file-upload v1.1.0
  https://github.com/nervgh/angular-file-upload
 */
 (function(angular, factory) {
@@ -78,28 +78,27 @@ module
             FileUploader.prototype.isHTML5 = !!($window.File && $window.FormData);
             /**
              * Adds items to the queue
-             * @param {FileList|File|HTMLInputElement} files
+             * @param {File|HTMLInputElement|Object|FileList|Array<Object>} files
              * @param {Object} [options]
              * @param {Array<Function>|String} filters
              */
             FileUploader.prototype.addToQueue = function(files, options, filters) {
-                var list = angular.isElement(files) ? [files]: files;
+                var list = this.isArrayLikeObject(files) ? files: [files];
                 var arrayOfFilters = this._getFilters(filters);
                 var count = this.queue.length;
                 var addedFileItems = [];
 
-                angular.forEach(list, function(file) {
-                    var item = this._getFileOrFileLikeObject(file);
+                angular.forEach(list, function(some /*{File|HTMLInputElement|Object}*/) {
+                    var temp = new FileUploader.FileLikeObject(some);
 
-                    if (this._isValidFile(item, arrayOfFilters, options)) {
-                        var input = this.isFile(item) ? null : file;
-                        var fileItem = new FileUploader.FileItem(this, item, options, input);
+                    if (this._isValidFile(temp, arrayOfFilters, options)) {
+                        var fileItem = new FileUploader.FileItem(this, some, options);
                         addedFileItems.push(fileItem);
                         this.queue.push(fileItem);
                         this._onAfterAddingFile(fileItem);
                     } else {
                         var filter = this.filters[this._failFilterIndex];
-                        this._onWhenAddingFileFailed(item, filter, options);
+                        this._onWhenAddingFileFailed(temp, filter, options);
                     }
                 }, this);
 
@@ -199,6 +198,14 @@ module
             FileUploader.prototype.isFileLikeObject = function(value) {
                 return value instanceof FileUploader.FileLikeObject;
             };
+            /**
+             * Returns "true" if value is array like object
+             * @param {*} value
+             * @returns {Boolean}
+             */
+            FileUploader.prototype.isArrayLikeObject = function(value) {
+                return (angular.isObject(value) && 'length' in value);
+            };
             /**
              * Returns a index of item from the queue
              * @param {Item|Number} value
@@ -381,16 +388,6 @@ module
                     return filter.fn.call(this, file, options);
                 }, this);
             };
-            /**
-             * Returns a file or a file-like object
-             * @param {File|HTMLInputElement} some
-             * @returns {File|Object}
-             * @private
-             */
-            FileUploader.prototype._getFileOrFileLikeObject = function(some) {
-                if (this.isFile(some) || this.isFileLikeObject(some)) return some;
-                return new FileUploader.FileLikeObject(some.value);
-            };
             /**
              * Checks whether upload successful
              * @param {Number} status
@@ -695,6 +692,10 @@ module
              * @borrows FileUploader.prototype.isFileLikeObject
              */
             FileUploader.isFileLikeObject = FileUploader.prototype.isFileLikeObject;
+            /**
+             * @borrows FileUploader.prototype.isArrayLikeObject
+             */
+            FileUploader.isArrayLikeObject = FileUploader.prototype.isArrayLikeObject;
             /**
              * @borrows FileUploader.prototype.isHTML5
              */
@@ -720,17 +721,19 @@ module
 
             /**
              * Creates an instance of FileLikeObject
-             * @param {String|Object} fakePathOrObject
+             * @param {File|HTMLInputElement|Object} fileOrInput
              * @constructor
              */
-            function FileLikeObject(fakePathOrObject) {
+            function FileLikeObject(fileOrInput) {
+                var isInput = angular.isElement(fileOrInput);
+                var fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
                 var postfix = angular.isString(fakePathOrObject) ? 'FakePath' : 'Object';
                 var method = '_createFrom' + postfix;
                 this[method](fakePathOrObject);
             }
 
             /**
-             * Creates file from fake path string
+             * Creates file like object from fake path string
              * @param {String} path
              * @private
              */
@@ -741,7 +744,7 @@ module
                 this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
             };
             /**
-             * Creates file from object
+             * Creates file like object from object
              * @param {File|FileLikeObject} object
              * @private
              */
@@ -757,13 +760,14 @@ module
             /**
              * Creates an instance of FileItem
              * @param {FileUploader} uploader
-             * @param {File|FileLikeObject} file
-             * @param {File|Object} options
-             * @param {HTMLInputElement} [input]
+             * @param {File|HTMLInputElement|Object} some
+             * @param {Object} options
              * @constructor
              */
-            function FileItem(uploader, file, options, input) {
-                file = uploader._getFileOrFileLikeObject(file);
+            function FileItem(uploader, some, options) {
+                var isInput = angular.isElement(some);
+                var input = isInput ? angular.element(some) : null;
+                var file = !isInput ? some : null;
 
                 angular.extend(this, {
                     url: uploader.url,
@@ -775,7 +779,7 @@ module
                     method: uploader.method
                 }, options, {
                     uploader: uploader,
-                    file: new FileUploader.FileLikeObject(file),
+                    file: new FileUploader.FileLikeObject(some),
                     isReady: false,
                     isUploading: false,
                     isUploaded: false,
@@ -784,13 +788,11 @@ module
                     isError: false,
                     progress: 0,
                     index: null,
-                    _file: file
+                    _file: file,
+                    _input: input
                 });
 
-                if (input) {
-                    this._input = angular.element(input);
-                    this._replaceNode(this._input);
-                }
+                if (input) this._replaceNode(input);
             }
             /**********************
              * PUBLIC