jquery.fileupload-rails 1.3.0 → 1.4.0

data/Readme.md

@@ -41,6 +41,8 @@ If you downloaded jquery.ui assets into your project, delete them and use [jquer
 
 ## Changelog
 
+1.4.0. Core 5.28.4.
+
 1.3.0. Core 5.26.
 
 1.2.0. Core 5.21.1, demo instructions.

data/jquery.fileupload-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "jquery.fileupload-rails"
-  s.version     = "1.3.0"
+  s.version     = "1.4.0"
   s.author      = "Semyon Perepelitsa"
   s.email       = "sema@sema.in"
   s.homepage    = "https://github.com/semaperepelitsa/jquery.fileupload-rails"

data/vendor/assets/javascripts/jquery.fileupload.js

@@ -2,7 +2,7 @@
 //= require jquery.iframe-transport
 
 /*
- * jQuery File Upload Plugin 5.26
+ * jQuery File Upload Plugin 5.28.4
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -218,7 +218,7 @@
         ],
 
         _BitrateTimer: function () {
-            this.timestamp = +(new Date());
+            this.timestamp = (new Date()).getTime();
             this.loaded = 0;
             this.bitrate = 0;
             this.getBitrate = function (now, loaded, interval) {
@@ -246,7 +246,7 @@
             if ($.isArray(options.formData)) {
                 return options.formData;
             }
-            if (options.formData) {
+            if ($.type(options.formData) === 'object') {
                 formData = [];
                 $.each(options.formData, function (name, value) {
                     formData.push({name: name, value: value});
@@ -265,16 +265,34 @@
         },
 
         _initProgressObject: function (obj) {
-            obj._progress = {
+            var progress = {
                 loaded: 0,
                 total: 0,
                 bitrate: 0
             };
+            if (obj._progress) {
+                $.extend(obj._progress, progress);
+            } else {
+                obj._progress = progress;
+            }
+        },
+
+        _initResponseObject: function (obj) {
+            var prop;
+            if (obj._response) {
+                for (prop in obj._response) {
+                    if (obj._response.hasOwnProperty(prop)) {
+                        delete obj._response[prop];
+                    }
+                }
+            } else {
+                obj._response = {};
+            }
         },
 
         _onProgress: function (e, data) {
             if (e.lengthComputable) {
-                var now = +(new Date()),
+                var now = (new Date()).getTime(),
                     loaded;
                 if (data._time && data.progressInterval &&
                         (now - data._time < data.progressInterval) &&
@@ -544,7 +562,7 @@
                 if (this.jqXHR) {
                     return this.jqXHR.abort();
                 }
-                return this._getXHRPromise();
+                return that._getXHRPromise();
             };
             data.state = function () {
                 if (this.jqXHR) {
@@ -554,6 +572,9 @@
             data.progress = function () {
                 return this._progress;
             };
+            data.response = function () {
+                return this._response;
+            };
         },
 
         // Parses the Range header from the server response
@@ -682,9 +703,11 @@
                 this._progress.loaded = this._progress.total = 0;
                 this._progress.bitrate = 0;
             }
-            if (!data._progress) {
-                data._progress = {};
-            }
+            // Make sure the container objects for the .response() and
+            // .progress() methods on the data object are available
+            // and reset to their initial state:
+            this._initResponseObject(data);
+            this._initProgressObject(data);
             data._progress.loaded = data.loaded = data.uploadedBytes || 0;
             data._progress.total = data.total = this._getTotal(data.files) || 1;
             data._progress.bitrate = data.bitrate = 0;
@@ -695,7 +718,8 @@
         },
 
         _onDone: function (result, textStatus, jqXHR, options) {
-            var total = options._progress.total;
+            var total = options._progress.total,
+                response = options._response;
             if (options._progress.loaded < total) {
                 // Create a progress event if no final progress event
                 // with loaded equaling total has been triggered:
@@ -705,35 +729,30 @@
                     total: total
                 }), options);
             }
-            options.result = result;
-            options.textStatus = textStatus;
-            options.jqXHR = jqXHR;
+            response.result = options.result = result;
+            response.textStatus = options.textStatus = textStatus;
+            response.jqXHR = options.jqXHR = jqXHR;
             this._trigger('done', null, options);
         },
 
         _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            options.jqXHR = jqXHR;
-            options.textStatus = textStatus;
-            options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
+            var response = options._response;
             if (options.recalculateProgress) {
                 // Remove the failed (error or abort) file upload from
                 // the global progress calculation:
                 this._progress.loaded -= options._progress.loaded;
                 this._progress.total -= options._progress.total;
             }
+            response.jqXHR = options.jqXHR = jqXHR;
+            response.textStatus = options.textStatus = textStatus;
+            response.errorThrown = options.errorThrown = errorThrown;
+            this._trigger('fail', null, options);
         },
 
         _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
             // jqXHRorResult, textStatus and jqXHRorError are added to the
             // options object via done and fail callbacks
-            this._active -= 1;
             this._trigger('always', null, options);
-            if (this._active === 0) {
-                // The stop callback is triggered when all uploads have
-                // been completed, equivalent to the global ajaxStop event:
-                this._trigger('stop');
-            }
         },
 
         _onSend: function (e, data) {
@@ -759,13 +778,14 @@
                     }).fail(function (jqXHR, textStatus, errorThrown) {
                         that._onFail(jqXHR, textStatus, errorThrown, options);
                     }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._sending -= 1;
                         that._onAlways(
                             jqXHRorResult,
                             textStatus,
                             jqXHRorError,
                             options
                         );
+                        that._sending -= 1;
+                        that._active -= 1;
                         if (options.limitConcurrentUploads &&
                                 options.limitConcurrentUploads > that._sending) {
                             // Start the next queued upload,
@@ -779,6 +799,11 @@
                                 nextSlot = that._slots.shift();
                             }
                         }
+                        if (that._active === 0) {
+                            // The stop callback is triggered when all uploads have
+                            // been completed, equivalent to the global ajaxStop event:
+                            that._trigger('stop');
+                        }
                     });
                     return jqXHR;
                 };
@@ -844,6 +869,7 @@
                 var newData = $.extend({}, data);
                 newData.files = fileSet ? element : [element];
                 newData.paramName = paramNameSet[index];
+                that._initResponseObject(newData);
                 that._initProgressObject(newData);
                 that._addConvenienceMethods(e, newData);
                 result = that._trigger('add', e, newData);
@@ -1124,6 +1150,12 @@
             this._initEventHandlers();
         },
 
+        // This method is exposed to the widget API and allows to query
+        // the number of active uploads:
+        active: function () {
+            return this._active;
+        },
+
         // This method is exposed to the widget API and allows to query
         // the widget upload progress.
         // It returns an object with loaded, total and bitrate properties

metadata

@@ -2,14 +2,14 @@
 name: jquery.fileupload-rails
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement