aboutsummaryrefslogtreecommitdiffstats
path: root/library/blueimp_upload/js/jquery.fileupload-process.js
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-05 15:35:05 -0700
committerzotlabs <mike@macgirvin.com>2017-07-05 15:35:05 -0700
commitfca8e0aa6ac9d4f2084371486e906d7e3726a5a5 (patch)
tree81d27ea002828a42c53541f741bad44684a2c601 /library/blueimp_upload/js/jquery.fileupload-process.js
parent41111bcdadcd16ebc4f078fc812eb5a290f185e5 (diff)
parent8dd9ab05a97f92f9eca5d527e48272f3a44010a8 (diff)
downloadvolse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.gz
volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.bz2
volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/blueimp_upload/js/jquery.fileupload-process.js')
-rw-r--r--library/blueimp_upload/js/jquery.fileupload-process.js18
1 files changed, 12 insertions, 6 deletions
diff --git a/library/blueimp_upload/js/jquery.fileupload-process.js b/library/blueimp_upload/js/jquery.fileupload-process.js
index 8a6b929a6..638f0d26b 100644
--- a/library/blueimp_upload/js/jquery.fileupload-process.js
+++ b/library/blueimp_upload/js/jquery.fileupload-process.js
@@ -1,18 +1,18 @@
/*
- * jQuery File Upload Processing Plugin 1.3.0
+ * jQuery File Upload Processing Plugin
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2012, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
*/
/* jshint nomen:false */
-/* global define, window */
+/* global define, require, window */
-(function (factory) {
+;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
@@ -20,6 +20,12 @@
'jquery',
'./jquery.fileupload'
], factory);
+ } else if (typeof exports === 'object') {
+ // Node/CommonJS:
+ factory(
+ require('jquery'),
+ require('./jquery.fileupload')
+ );
} else {
// Browser globals:
factory(
@@ -81,7 +87,7 @@
settings
);
};
- chain = chain.pipe(func, settings.always && func);
+ chain = chain.then(func, settings.always && func);
});
chain
.done(function () {
@@ -148,7 +154,7 @@
};
opts.index = index;
that._processing += 1;
- that._processingQueue = that._processingQueue.pipe(func, func)
+ that._processingQueue = that._processingQueue.then(func, func)
.always(function () {
that._processing -= 1;
if (that._processing === 0) {