Skip to content

Commit 811678c

Browse files
author
peterwake
committed
Update assets to jQuery-File-Upload v9.12.5
1 parent b293be1 commit 811678c

15 files changed

+30
-25
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jquery-fileupload-rails is a library that integrates jQuery File Upload for Rail
66

77
## Plugin versions
88

9-
* jQuery File Upload Plugin v9.11.2
9+
* jQuery File Upload Plugin v9.12.5
1010

1111
## Installing Gem
1212

@@ -75,7 +75,7 @@ The `jquery.iframe-transport` fallback transport has some special caveats regard
7575
Rails.application.config.middleware.use JQuery::FileUpload::Rails::Middleware
7676

7777
## Example apps
78-
[jquery-fileupload-rails-paperclip-example](https://github.com/tors/jquery-fileupload-rails-paperclip-example): jQuery File Upload in Rails 3.2 with Paperclip and Bootstrap
78+
[jquery-fileupload-rails-paperclip-example](https://github.com/tors/jquery-fileupload-rails-paperclip-example): jQuery File Upload in Rails 3.2 with Paperclip and Bootstrap
7979

8080
[rails-resumable-jquery-fileupload](https://github.com/vgantchev/rails-resumable-jquery-fileupload): resumable (chunked) uploads with jQuery File Upload in Rails 4.2 using Paperclip
8181

‎app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/* global define, require, window, document */
1313

14-
(function (factory) {
14+
;(function (factory) {
1515
'use strict';
1616
if (typeof define === 'function' && define.amd) {
1717
// Register as an anonymous AMD module:
@@ -64,6 +64,12 @@
6464
loc = $('<a>').prop('href', options.postMessage)[0],
6565
target = loc.protocol + '//' + loc.host,
6666
xhrUpload = options.xhr().upload;
67+
// IE always includes the port for the host property of a link
68+
// element, but not in the location.host or origin property for the
69+
// default http port 80 and https port 443, so we strip it:
70+
if (/^(http:\/\/.+:80)|(https:\/\/.+:443)$/.test(target)) {
71+
target = target.replace(/:(80|443)$/, '');
72+
}
6773
return {
6874
send: function (_, completeCallback) {
6975
counter += 1;

‎app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
/* global define, require, window, XDomainRequest */
1616

17-
(function (factory) {
17+
;(function (factory) {
1818
'use strict';
1919
if (typeof define === 'function' && define.amd) {
2020
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-angular.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, angular */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window, document */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window, Blob */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:
@@ -21,7 +21,6 @@
2121
'load-image',
2222
'load-image-meta',
2323
'load-image-exif',
24-
'load-image-ios',
2524
'canvas-to-blob',
2625
'./jquery.fileupload-process'
2726
], factory);

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:
@@ -84,7 +84,7 @@
8484
settings
8585
);
8686
};
87-
chain = chain.pipe(func, settings.always && func);
87+
chain = chain.then(func, settings.always && func);
8888
});
8989
chain
9090
.done(function () {
@@ -151,7 +151,7 @@
151151
};
152152
opts.index = index;
153153
that._processing += 1;
154-
that._processingQueue = that._processingQueue.pipe(func, func)
154+
that._processingQueue = that._processingQueue.then(func, func)
155155
.always(function () {
156156
that._processing -= 1;
157157
if (that._processing === 0) {

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/* global define, require, window */
1313

14-
(function (factory) {
14+
;(function (factory) {
1515
'use strict';
1616
if (typeof define === 'function' && define.amd) {
1717
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window, document */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/jquery.fileupload.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/* jshint nomen:false */
1313
/* global define, require, window, document, location, Blob, FormData */
1414

15-
(function (factory) {
15+
;(function (factory) {
1616
'use strict';
1717
if (typeof define === 'function' && define.amd) {
1818
// Register as an anonymous AMD module:
@@ -652,15 +652,15 @@
652652
data.process = function (resolveFunc, rejectFunc) {
653653
if (resolveFunc || rejectFunc) {
654654
data._processQueue = this._processQueue =
655-
(this._processQueue || getPromise([this])).pipe(
655+
(this._processQueue || getPromise([this])).then(
656656
function () {
657657
if (data.errorThrown) {
658658
return $.Deferred()
659659
.rejectWith(that, [data]).promise();
660660
}
661661
return getPromise(arguments);
662662
}
663-
).pipe(resolveFunc, rejectFunc);
663+
).then(resolveFunc, rejectFunc);
664664
}
665665
return this._processQueue || getPromise([this]);
666666
};
@@ -945,9 +945,9 @@
945945
if (this.options.limitConcurrentUploads > 1) {
946946
slot = $.Deferred();
947947
this._slots.push(slot);
948-
pipe = slot.pipe(send);
948+
pipe = slot.then(send);
949949
} else {
950-
this._sequence = this._sequence.pipe(send, send);
950+
this._sequence = this._sequence.then(send, send);
951951
pipe = this._sequence;
952952
}
953953
// Return the piped Promise object, enhanced with an abort method,
@@ -1139,7 +1139,7 @@
11391139
$.map(entries, function (entry) {
11401140
return that._handleFileTreeEntry(entry, path);
11411141
})
1142-
).pipe(function () {
1142+
).then(function () {
11431143
return Array.prototype.concat.apply(
11441144
[],
11451145
arguments
@@ -1208,7 +1208,7 @@
12081208
return $.when.apply(
12091209
$,
12101210
$.map(fileInput, this._getSingleFileInputFiles)
1211-
).pipe(function () {
1211+
).then(function () {
12121212
return Array.prototype.concat.apply(
12131213
[],
12141214
arguments

‎app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/* global define, require, window, document */
1313

14-
(function (factory) {
14+
;(function (factory) {
1515
'use strict';
1616
if (typeof define === 'function' && define.amd) {
1717
// Register as an anonymous AMD module:

‎app/assets/javascripts/jquery-fileupload/vendor/load-image.all.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/assets/stylesheets/jquery.fileupload.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
margin: 0;
2323
opacity: 0;
2424
-ms-filter: 'alpha(opacity=0)';
25-
font-size: 200px;
25+
font-size: 200px !important;
2626
direction: ltr;
2727
cursor: pointer;
2828
}

0 commit comments

Comments
 (0)