Fetch updated js and css from upstream.

sigurdga · sigurdga · commit 3e5b1f0e8181 · 2011-07-13T13:46:14.000+02:00
diff --git a/fileupload/static/application.js b/fileupload/static/application.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin JS Example 5.0.1
+ * jQuery File Upload Plugin JS Example 5.0.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -9,10 +9,11 @@
  * http://creativecommons.org/licenses/MIT/
  */
 
-/*jslint nomen: false */
+/*jslint nomen: true */
 /*global $ */
 
 $(function () {
+    'use strict';
 
     // Initialize the jQuery File Upload widget:
     $('#fileupload').fileupload();
diff --git a/fileupload/static/jquery.fileupload-ui.css b/fileupload/static/jquery.fileupload-ui.css
@@ -1,6 +1,6 @@
 @charset 'UTF-8';
 /*
- * jQuery File Upload UI Plugin CSS 5.0.5
+ * jQuery File Upload UI Plugin CSS 5.0.6
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -10,7 +10,7 @@
  * http://creativecommons.org/licenses/MIT/
  */
 
-.ui-button input {
+.fileupload-buttonbar .ui-button input {
   position: absolute;
   top: 0;
   right: 0;
@@ -52,16 +52,16 @@
   border-top-width: 0;
 }
 
-.ui-progressbar {
+.fileupload-content .ui-progressbar {
   width: 200px;
   height: 20px;
 }
 
-.ui-progressbar-value {
+.fileupload-content .ui-progressbar-value {
   background: url(pbar-ani.gif);
 }
 
-.fileupload-progressbar {
+.fileupload-content .fileupload-progressbar {
   width: 400px;
   margin: 10px 0;
 }
diff --git a/fileupload/static/jquery.fileupload-ui.js b/fileupload/static/jquery.fileupload-ui.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload User Interface Plugin 5.0.12
+ * jQuery File Upload User Interface Plugin 5.0.13
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -9,7 +9,7 @@
  * http://creativecommons.org/licenses/MIT/
  */
 
-/*jslint nomen: false, unparam: true, regexp: false */
+/*jslint nomen: true, unparam: true, regexp: true */
 /*global window, document, URL, webkitURL, FileReader, jQuery */
 
 (function ($) {
diff --git a/fileupload/static/jquery.fileupload.js b/fileupload/static/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.0.1
+ * jQuery File Upload Plugin 5.0.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -9,7 +9,7 @@
  * http://creativecommons.org/licenses/MIT/
  */
 
-/*jslint nomen: false, unparam: true, regexp: false */
+/*jslint nomen: true, unparam: true, regexp: true */
 /*global document, XMLHttpRequestUpload, Blob, File, FormData, location, jQuery */
 
 (function ($) {
@@ -232,7 +232,7 @@
                     options.data = options.blob;
                 }
             }
-            if (options.multipart) {
+            if (options.multipart && typeof FormData !== 'undefined') {
                 if (options.formData instanceof FormData) {
                     formData = options.formData;
                 } else {
@@ -318,14 +318,14 @@
 
         // Creates and returns a Promise object enhanced with
         // the jqXHR methods abort, success, error and complete:
-        _getXHRPromise: function (resolveOrReject, context) {
+        _getXHRPromise: function (resolveOrReject, context, args) {
             var dfd = $.Deferred(),
                 promise = dfd.promise();
             context = context || this.options.context || promise;
             if (resolveOrReject === true) {
-                dfd.resolveWith(context);
+                dfd.resolveWith(context, args);
             } else if (resolveOrReject === false) {
-                dfd.rejectWith(context);
+                dfd.rejectWith(context, args);
             }
             promise.abort = dfd.promise;
             return this._enhancePromise(promise);
@@ -452,11 +452,12 @@
             }
         },
 
-        _onAlways: function (result, textStatus, jqXHR, options) {
+        _onAlways: function (result, textStatus, jqXHR, errorThrown, options) {
             this._active -= 1;
             options.result = result;
             options.textStatus = textStatus;
             options.jqXHR = jqXHR;
+            options.errorThrown = errorThrown;
             this._trigger('always', null, options);
             if (this._active === 0) {
                 // The stop callback is triggered when all uploads have
@@ -472,17 +473,22 @@
                 jqXHR,
                 pipe,
                 options = that._getAJAXSettings(data),
-                send = function () {
-                    jqXHR = ((that._trigger('send', e, options) !== false && (
-                        that._chunkedUpload(options) ||
-                        $.ajax(options)
-                    )) || that._getXHRPromise(false, options.context)
+                send = function (resolve, args) {
+                    jqXHR = jqXHR || (
+                        (resolve !== false &&
+                        that._trigger('send', e, options) !== false &&
+                        (that._chunkedUpload(options) || $.ajax(options))) ||
+                        that._getXHRPromise(false, options.context, args)
                     ).done(function (result, textStatus, jqXHR) {
                         that._onDone(result, textStatus, jqXHR, options);
                     }).fail(function (jqXHR, textStatus, errorThrown) {
                         that._onFail(jqXHR, textStatus, errorThrown, options);
-                    }).always(function (result, textStatus, jqXHR) {
-                        that._onAlways(result, textStatus, jqXHR, options);
+                    }).always(function (a1, a2, a3) {
+                        if (a3 && a3.done) {
+                            that._onAlways(a1, a2, a3, undefined, options);
+                        } else {
+                            that._onAlways(undefined, a2, a1, a3, options);
+                        }
                     });
                     return jqXHR;
                 };
@@ -493,6 +499,9 @@
                 // and jqXHR callbacks mapped to the equivalent Promise methods:
                 pipe = (this._sequence = this._sequence.pipe(send, send));
                 pipe.abort = function () {
+                    if (!jqXHR) {
+                        return send(false, [undefined, 'abort', 'abort']);
+                    }
                     return jqXHR.abort();
                 };
                 return this._enhancePromise(pipe);
diff --git a/fileupload/static/jquery.iframe-transport.js b/fileupload/static/jquery.iframe-transport.js
@@ -1,5 +1,5 @@
 /*
- * jQuery Iframe Transport Plugin 1.1
+ * jQuery Iframe Transport Plugin 1.2.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
@@ -18,11 +18,13 @@
     // Helper variable to create unique names for the transport iframes:
     var counter = 0;
 
-    // The iframe transport accepts two additional options:
+    // The iframe transport accepts three additional options:
     // options.fileInput: a jQuery collection of file input fields
+    // options.paramName: the parameter name for the file form data,
+    //  overrides the name property of the file input field(s)
     // options.formData: an array of objects with name and value properties,
-    // equivalent to the return data of .serializeArray(), e.g.:
-    // [{name: a, value: 1}, {name: b, value: 2}]
+    //  equivalent to the return data of .serializeArray(), e.g.:
+    //  [{name: a, value: 1}, {name: b, value: 2}]
     $.ajaxTransport('iframe', function (options, originalOptions, jqXHR) {
         if (options.type === 'POST' || options.type === 'GET') {
             var form,
@@ -43,12 +45,26 @@
                         iframe
                             .unbind('load')
                             .bind('load', function () {
+                                var response;
+                                // Wrap in a try/catch block to catch exceptions thrown
+                                // when trying to access cross-domain iframe contents:
+                                try {
+                                    response = iframe.contents();
+                                    // Google Chrome and Firefox do not throw an
+                                    // exception when calling iframe.contents() on
+                                    // cross-domain requests, so we unify the response:
+                                    if (!response.length || !response[0].firstChild) {
+                                        throw new Error();
+                                    }
+                                } catch (e) {
+                                    response = undefined;
+                                }
                                 // The complete callback returns the
                                 // iframe content document as response object:
                                 completeCallback(
                                     200,
                                     'success',
-                                    {'iframe': iframe.contents()}
+                                    {'iframe': response}
                                 );
                                 // Fix for IE endless progress bar activity bug
                                 // (happens on form submits to iframe targets):
@@ -75,6 +91,11 @@
                             options.fileInput.after(function (index) {
                                 return fileInputClones[index];
                             });
+                            if (options.paramName) {
+                                options.fileInput.each(function () {
+                                    $(this).prop('name', options.paramName);
+                                });
+                            }
                             // Appending the file input fields to the hidden form
                             // removes them from their original location:
                             form
@@ -88,7 +109,9 @@
                         // by replacing the clones with the originals:
                         if (fileInputClones && fileInputClones.length) {
                             options.fileInput.each(function (index, input) {
-                                $(fileInputClones[index]).replaceWith(input);
+                                var clone = $(fileInputClones[index]);
+                                $(input).prop('name', clone.prop('name'));
+                                clone.replaceWith(input);
                             });
                         }
                     });
