Skip to content

Commit faaf7f3

Browse files
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: '@',

0 commit comments

Comments
 (0)