angularjs-file-upload-rails 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebaf468ac5a74e0da00f5db6a8d40267a39b712
-  data.tar.gz: a700b2c4e863e97ef119d064cba43fc64933b68f
+  metadata.gz: 4d75e239c01c206babcb6a20daadd072f18d7aeb
+  data.tar.gz: 73eda9a4f0029589e4f24b401bafcecf818502ed
 SHA512:
-  metadata.gz: aaa843b398eae0f2d35372b1c8a8a15ce5b2f9939a05e61d11ff85bb505f47a820a7c57b695f46ab5fe4bde28183e581d3e2689410d81aab39dd73725b606a41
-  data.tar.gz: 4ff131e06d45a8d509442e3a39ab03dd74048d02560bab2aea4d6763b06be9d331bf5458ab521741a548d169229cd9a2f4e0d12dd88a28557b516ef5f34b1847
+  metadata.gz: ba697fcd751277949893077876d04e50997ddcf64b1f10c9ef71cd3a71f671aa3a1b5c843f2077bc4f8e2781568b0fcf9fef24847f43f02ea76c20cbb39fb89b
+  data.tar.gz: 6832503e9ae59085135d6bd39dcb29fe054491fe43aab950c4b9e8f275690e580f4583c5738b5c60e07811a504ddd273c1c1c29333ca982f63948150d54c4e35

data/README.md

@@ -1,4 +1,6 @@
-# Angularjs::File::Upload
+[![Gem Version](https://badge.fury.io/rb/angularjs-file-upload-rails.svg)](http://badge.fury.io/rb/angularjs-file-upload-rails)
+
+# AngularJS File Upload
 
 A gem that uses [angular-file-upload](https://github.com/nervgh/angular-file-upload) as an asset in the Rails Asset Pipeline.
 

data/app/assets/javascripts/angularjs-file-upload.js

@@ -1,5 +1,5 @@
 /*
- angular-file-upload v1.0.1
+ angular-file-upload v1.1.0
  https://github.com/nervgh/angular-file-upload
 */
 (function(angular, factory) {
@@ -10,9 +10,10 @@
     } else {
         return factory(angular);
     }
-}(typeof angular === 'undefined' ? null : angular || null, function(angular) {
+}(typeof angular === 'undefined' ? null : angular, function(angular) {
 
 var module = angular.module('angularFileUpload', []);
+
 'use strict';
 
 /**
@@ -77,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);
 
@@ -198,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
@@ -380,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
@@ -694,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
              */
@@ -719,29 +721,53 @@ module
 
             /**
              * Creates an instance of FileLikeObject
-             * @param {String} fakePath
+             * @param {File|HTMLInputElement|Object} fileOrInput
              * @constructor
              */
-            function FileLikeObject(fakePath) {
-                var path = fakePath;
+            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 like object from fake path string
+             * @param {String} path
+             * @private
+             */
+            FileLikeObject.prototype._createFromFakePath = function(path) {
                 this.lastModifiedDate = null;
                 this.size = null;
                 this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
                 this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
-            }
+            };
+            /**
+             * Creates file like object from object
+             * @param {File|FileLikeObject} object
+             * @private
+             */
+            FileLikeObject.prototype._createFromObject = function(object) {
+                this.lastModifiedDate = angular.copy(object.lastModifiedDate);
+                this.size = object.size;
+                this.type = object.type;
+                this.name = object.name;
+            };
 
             // ---------------------------
 
             /**
              * Creates an instance of FileItem
              * @param {FileUploader} uploader
-             * @param {File|FileLikeObject|HTMLInputElement} 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,
@@ -753,7 +779,7 @@ module
                     method: uploader.method
                 }, options, {
                     uploader: uploader,
-                    file: angular.copy(file),
+                    file: new FileUploader.FileLikeObject(some),
                     isReady: false,
                     isUploading: false,
                     isUploaded: false,
@@ -762,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
@@ -1048,6 +1072,13 @@ module
              * @return {Array<Function>|String|undefined}
              */
             FileSelect.prototype.getFilters = function() {};
+            /**
+             * If returns "true" then HTMLInputElement will be cleared
+             * @returns {Boolean}
+             */
+            FileSelect.prototype.isEmptyAfterSelection = function() {
+                return !!this.element.attr('multiple');
+            };
             /**
              * Event handler
              */
@@ -1058,7 +1089,7 @@ module
 
                 if (!this.uploader.isHTML5) this.destroy();
                 this.uploader.addToQueue(files, options, filters);
-                if (this.uploader.isHTML5) this.element.prop('value', null);
+                if (this.isEmptyAfterSelection()) this.element.prop('value', null);
             };
 
             // ---------------------------

data/lib/angularjs-file-upload/version.rb

@@ -1,3 +1,3 @@
 module AngularjsFileUpload
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-file-upload-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Marthyn Olthof
@@ -97,3 +97,4 @@ summary: It supports drag-n-drop upload, upload progress, validation filters and
   upload method for older browsers. Works with any server side platform which supports
   standard HTML form uploads.
 test_files: []
+has_rdoc: