Skip to content

Commit faaf7f3

Browse files
optiopti
committed
Merge pull request #80 from opti/assets_v9.11.2
Update assets to v9.11.2
2 parents 13a13d7 + ca18971 commit faaf7f3

20 files changed

+69
-55
lines changed

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ jquery-fileupload-rails is a library that integrates jQuery File Upload for Rail
66

77
## Plugin versions
88

9-
* jQuery File Upload User Interface Plugin 9.6.1
10-
* jQuery File Upload Plugin 5.42.3
11-
* jQuery UI Widget 1.11.1+CommonJS
9+
* jQuery File Upload Plugin v9.11.2
1210

1311
## Installing Gem
1412

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery postMessage Transport Plugin 1.1.2
2+
* jQuery postMessage Transport Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery XDomainRequest Transport Plugin 1.1.4
2+
* jQuery XDomainRequest Transport Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload AngularJS Plugin 2.2.0
2+
* jQuery File Upload AngularJS Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan
@@ -91,7 +91,7 @@
9191
angular.forEach(data.files, function (file) {
9292
filesCopy.push(file);
9393
});
94-
scope.$apply(function () {
94+
scope.$parent.$applyAsync(function () {
9595
addFileMethods(scope, data);
9696
var method = scope.option('prependFiles') ?
9797
'unshift' : 'push';
@@ -100,7 +100,7 @@
100100
data.process(function () {
101101
return scope.process(data);
102102
}).always(function () {
103-
scope.$apply(function () {
103+
scope.$parent.$applyAsync(function () {
104104
addFileMethods(scope, data);
105105
scope.replace(filesCopy, data.files);
106106
});
@@ -112,12 +112,6 @@
112112
}
113113
});
114114
},
115-
progress: function (e, data) {
116-
if (e.isDefaultPrevented()) {
117-
return false;
118-
}
119-
data.scope.$apply();
120-
},
121115
done: function (e, data) {
122116
if (e.isDefaultPrevented()) {
123117
return false;
@@ -320,9 +314,11 @@
320314
'fileuploadprocessalways',
321315
'fileuploadprocessstop'
322316
].join(' '), function (e, data) {
323-
if ($scope.$emit(e.type, data).defaultPrevented) {
324-
e.preventDefault();
325-
}
317+
$scope.$parent.$applyAsync(function () {
318+
if ($scope.$emit(e.type, data).defaultPrevented) {
319+
e.preventDefault();
320+
}
321+
});
326322
}).on('remove', function () {
327323
// Remove upload methods from the scope,
328324
// when the widget is removed:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Audio Preview Plugin 1.0.4
2+
* jQuery File Upload Audio Preview Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Image Preview & Resize Plugin 1.7.3
2+
* jQuery File Upload Image Preview & Resize Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan
@@ -242,7 +242,7 @@
242242
blob.name = file.name;
243243
} else if (file.name) {
244244
blob.name = file.name.replace(
245-
/\..+$/,
245+
/\.\w+$/,
246246
'.' + blob.type.substr(6)
247247
);
248248
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload jQuery UI Plugin 8.7.2
2+
* jQuery File Upload jQuery UI Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Processing Plugin 1.3.1
2+
* jQuery File Upload Processing Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2012, Sebastian Tschan

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload User Interface Plugin 9.6.1
2+
* jQuery File Upload User Interface Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2010, Sebastian Tschan

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Validation Plugin 1.1.3
2+
* jQuery File Upload Validation Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan
@@ -36,7 +36,7 @@
3636
{
3737
action: 'validate',
3838
// Always trigger this action,
39-
// even if the previous action was rejected:
39+
// even if the previous action was rejected:
4040
always: true,
4141
// Options taken from the global options map:
4242
acceptFileTypes: '@',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Video Preview Plugin 1.0.4
2+
* jQuery File Upload Video Preview Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2013, Sebastian Tschan

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Plugin 5.42.3
2+
* jQuery File Upload Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2010, Sebastian Tschan
@@ -277,7 +277,8 @@
277277
// The following are jQuery ajax settings required for the file uploads:
278278
processData: false,
279279
contentType: false,
280-
cache: false
280+
cache: false,
281+
timeout: 0
281282
},
282283

283284
// A list of options that require reinitializing event listeners and/or
@@ -983,7 +984,10 @@
983984
fileSet,
984985
i,
985986
j = 0;
986-
if (limitSize && (!filesLength || files[0].size === undefined)) {
987+
if (!filesLength) {
988+
return false;
989+
}
990+
if (limitSize && files[0].size === undefined) {
987991
limitSize = undefined;
988992
}
989993
if (!(options.singleFileUploads || limit || limitSize) ||
@@ -1042,13 +1046,19 @@
10421046

10431047
_replaceFileInput: function (data) {
10441048
var input = data.fileInput,
1045-
inputClone = input.clone(true);
1049+
inputClone = input.clone(true),
1050+
restoreFocus = input.is(document.activeElement);
10461051
// Add a reference for the new cloned file input to the data argument:
10471052
data.fileInputClone = inputClone;
10481053
$('<form></form>').append(inputClone)[0].reset();
10491054
// Detaching allows to insert the fileInput on another form
10501055
// without loosing the file input value:
10511056
input.after(inputClone).detach();
1057+
// If the fileInput had focus before it was detached,
1058+
// restore focus to the inputClone.
1059+
if (restoreFocus) {
1060+
inputClone.focus();
1061+
}
10521062
// Avoid memory leaks with the detached file input:
10531063
$.cleanData(input.unbind('remove'));
10541064
// Replace the original file input element in the fileInput

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery Iframe Transport Plugin 1.8.3
2+
* jQuery Iframe Transport Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan

‎app/assets/javascripts/jquery-fileupload/vendor/canvas-to-blob.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@
9292
} else {
9393
window.dataURLtoBlob = dataURLtoBlob;
9494
}
95-
}(this));
95+
}(window));

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

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
/*! jQuery UI - v1.11.1+CommonJS - 2014-09-17
1+
/*! jQuery UI - v1.11.4+CommonJS - 2015-08-28
22
* http://jqueryui.com
33
* Includes: widget.js
4-
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
4+
* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
55

66
(function( factory ) {
77
if ( typeof define === "function" && define.amd ) {
88

99
// AMD. Register as an anonymous module.
1010
define([ "jquery" ], factory );
1111

12-
} else if (typeof exports === "object") {
13-
// Node/CommonJS:
14-
factory(require("jquery"));
12+
} else if ( typeof exports === "object" ) {
13+
14+
// Node/CommonJS
15+
factory( require( "jquery" ) );
1516

1617
} else {
1718

@@ -20,10 +21,10 @@
2021
}
2122
}(function( $ ) {
2223
/*!
23-
* jQuery UI Widget 1.11.1
24+
* jQuery UI Widget 1.11.4
2425
* http://jqueryui.com
2526
*
26-
* Copyright 2014 jQuery Foundation and other contributors
27+
* Copyright jQuery Foundation and other contributors
2728
* Released under the MIT license.
2829
* http://jquery.org/license
2930
*
@@ -47,7 +48,7 @@ $.cleanData = (function( orig ) {
4748
}
4849

4950
// http://bugs.jquery.com/ticket/8235
50-
} catch( e ) {}
51+
} catch ( e ) {}
5152
}
5253
orig( elems );
5354
};
@@ -201,11 +202,6 @@ $.widget.bridge = function( name, object ) {
201202
args = widget_slice.call( arguments, 1 ),
202203
returnValue = this;
203204

204-
// allow multiple hashes to be passed on init
205-
options = !isMethodCall && args.length ?
206-
$.widget.extend.apply( null, [ options ].concat(args) ) :
207-
options;
208-
209205
if ( isMethodCall ) {
210206
this.each(function() {
211207
var methodValue,
@@ -230,6 +226,12 @@ $.widget.bridge = function( name, object ) {
230226
}
231227
});
232228
} else {
229+
230+
// Allow multiple hashes to be passed on init
231+
if ( args.length ) {
232+
options = $.widget.extend.apply( null, [ options ].concat(args) );
233+
}
234+
233235
this.each(function() {
234236
var instance = $.data( this, fullName );
235237
if ( instance ) {
@@ -265,10 +267,6 @@ $.Widget.prototype = {
265267
this.element = $( element );
266268
this.uuid = widget_uuid++;
267269
this.eventNamespace = "." + this.widgetName + this.uuid;
268-
this.options = $.widget.extend( {},
269-
this.options,
270-
this._getCreateOptions(),
271-
options );
272270

273271
this.bindings = $();
274272
this.hoverable = $();
@@ -291,6 +289,11 @@ $.Widget.prototype = {
291289
this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
292290
}
293291

292+
this.options = $.widget.extend( {},
293+
this.options,
294+
this._getCreateOptions(),
295+
options );
296+
294297
this._create();
295298
this._trigger( "create", null, this._getCreateEventData() );
296299
this._init();
@@ -453,8 +456,14 @@ $.Widget.prototype = {
453456
},
454457

455458
_off: function( element, eventName ) {
456-
eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
459+
eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
460+
this.eventNamespace;
457461
element.unbind( eventName ).undelegate( eventName );
462+
463+
// Clear the stack to avoid memory leaks (#10056)
464+
this.bindings = $( this.bindings.not( element ).get() );
465+
this.focusable = $( this.focusable.not( element ).get() );
466+
this.hoverable = $( this.hoverable.not( element ).get() );
458467
},
459468

460469
_delay: function( handler, delay ) {

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "UTF-8";
22
/*
3-
* jQuery File Upload Plugin NoScript CSS 1.2.0
3+
* jQuery File Upload Plugin NoScript CSS
44
* https://github.com/blueimp/jQuery-File-Upload
55
*
66
* Copyright 2013, Sebastian Tschan

‎app/assets/stylesheets/jquery.fileupload-ui-noscript.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "UTF-8";
22
/*
3-
* jQuery File Upload UI Plugin NoScript CSS 8.8.5
3+
* jQuery File Upload UI Plugin NoScript CSS
44
* https://github.com/blueimp/jQuery-File-Upload
55
*
66
* Copyright 2012, Sebastian Tschan

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "UTF-8";
22
/*
3-
* jQuery File Upload UI Plugin CSS 9.0.0
3+
* jQuery File Upload UI Plugin CSS
44
* https://github.com/blueimp/jQuery-File-Upload
55
*
66
* Copyright 2010, Sebastian Tschan

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "UTF-8";
22
/*
3-
* jQuery File Upload Plugin CSS 1.3.0
3+
* jQuery File Upload Plugin CSS
44
* https://github.com/blueimp/jQuery-File-Upload
55
*
66
* Copyright 2013, Sebastian Tschan
@@ -13,6 +13,7 @@
1313
.fileinput-button {
1414
position: relative;
1515
overflow: hidden;
16+
display: inline-block;
1617
}
1718
.fileinput-button input {
1819
position: absolute;

0 commit comments

Comments
 (0)