Skip to content

Commit 21e3de5

Browse files
torstors
committed
Merge pull request #68 from opti/assets_v9.8.0
Update assets to jQuery-File-Upload 9.8.0
2 parents 0ff3c5b + 4ec122b commit 21e3de5

36 files changed

+1815
-1292
lines changed

‎README.md

+27-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ 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 6.11
10-
* jQuery File Upload Plugin 5.19.3
11-
* jQuery UI Widget 1.9.1+amd
9+
* jQuery File Upload User Interface Plugin 9.6.0
10+
* jQuery File Upload Plugin 5.42.0
11+
* jQuery UI Widget 1.11.1
1212

1313
## Installing Gem
1414

@@ -23,14 +23,22 @@ Require jquery-fileupload in your app/assets/application.js file.
2323
The snippet above will add the following js files to the mainfest file.
2424

2525
//= require jquery-fileupload/vendor/jquery.ui.widget
26+
//= require jquery-fileupload/vendor/tmpl
2627
//= require jquery-fileupload/vendor/load-image
2728
//= require jquery-fileupload/vendor/canvas-to-blob
28-
//= require jquery-fileupload/vendor/tmpl
2929
//= require jquery-fileupload/jquery.iframe-transport
3030
//= require jquery-fileupload/jquery.fileupload
31-
//= require jquery-fileupload/jquery.fileupload-fp
31+
//= require jquery-fileupload/jquery.fileupload-process
32+
//= require jquery-fileupload/jquery.fileupload-image
33+
//= require jquery-fileupload/jquery.fileupload-audio
34+
//= require jquery-fileupload/jquery.fileupload-video
35+
//= require jquery-fileupload/jquery.fileupload-validate
3236
//= require jquery-fileupload/jquery.fileupload-ui
3337
//= require jquery-fileupload/locale
38+
//= require jquery-fileupload/jquery.fileupload-angular
39+
//= require jquery-fileupload/jquery.fileupload-jquery-ui
40+
//= require jquery-fileupload/cors/jquery.postmessage-transport
41+
//= require jquery-fileupload/cors/jquery.xdr-transport
3442

3543
If you only need the basic files, just add the code below to your application.js file. [Basic setup guide](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
3644

@@ -42,12 +50,26 @@ The basic setup only includes the following files:
4250
//= require jquery-fileupload/jquery.iframe-transport
4351
//= require jquery-fileupload/jquery.fileupload
4452

53+
You can also require the following to get the js from the Basic-Plus, AngularJS and jQuery UI Examples:
54+
55+
//= require jquery-fileupload/basic-plus
56+
57+
//= require jquery-fileupload/angularjs
58+
59+
//= require jquery-fileupload/jquery-ui
60+
4561
## Using the stylesheet
4662

4763
Require the stylesheet file to app/assets/stylesheets/application.css
4864

65+
*= require jquery.fileupload
4966
*= require jquery.fileupload-ui
5067

68+
There are also noscript styles for Browsers with Javascript disabled, to use them create a noscript.css and add it to your precompile-list and layout inside a noscript tag:
69+
70+
*= require jquery.fileupload-noscript
71+
*= require jquery.fileupload-ui-noscript
72+
5173
## Using the middleware
5274

5375
The `jquery.iframe-transport` fallback transport has some special caveats regarding the response data type, http status, and character encodings. `jquery-fileupload-rails` includes a middleware that handles these inconsistencies seamlessly. If you decide to use it, create an initializer that adds the middleware to your application's middleware stack.

‎vendor/assets/images/loading.gif renamed to ‎app/assets/images/loading.gif

File renamed without changes.

‎vendor/assets/images/progressbar.gif renamed to ‎app/assets/images/progressbar.gif

File renamed without changes.

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//= require jquery-fileupload/vendor/jquery.ui.widget
2+
//= require jquery-fileupload/vendor/load-image.all.min
3+
//= require jquery-fileupload/vendor/canvas-to-blob
4+
//= require jquery-fileupload/jquery.iframe-transport
5+
//= require jquery-fileupload/jquery.fileupload
6+
//= require jquery-fileupload/jquery.fileupload-process
7+
//= require jquery-fileupload/jquery.fileupload-image
8+
//= require jquery-fileupload/jquery.fileupload-audio
9+
//= require jquery-fileupload/jquery.fileupload-video
10+
//= require jquery-fileupload/jquery.fileupload-validate
11+
//= require jquery-fileupload/jquery.fileupload-angular
12+
//= require jquery-fileupload/locale

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

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//= require jquery-fileupload/vendor/jquery.ui.widget
2+
//= require jquery-fileupload/vendor/load-image.all.min
3+
//= require jquery-fileupload/vendor/canvas-to-blob
4+
//= require jquery-fileupload/jquery.iframe-transport
5+
//= require jquery-fileupload/jquery.fileupload
6+
//= require jquery-fileupload/jquery.fileupload-process
7+
//= require jquery-fileupload/jquery.fileupload-image
8+
//= require jquery-fileupload/jquery.fileupload-audio
9+
//= require jquery-fileupload/jquery.fileupload-video
10+
//= require jquery-fileupload/jquery.fileupload-validate
11+
//= require jquery-fileupload/locale

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

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//= require jquery-fileupload/vendor/jquery.ui.widget
2+
//= require jquery-fileupload/jquery.iframe-transport
3+
//= require jquery-fileupload/jquery.fileupload

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery postMessage Transport Plugin 1.1
2+
* jQuery postMessage Transport Plugin 1.1.1
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan
@@ -9,8 +9,7 @@
99
* http://www.opensource.org/licenses/MIT
1010
*/
1111

12-
/*jslint unparam: true, nomen: true */
13-
/*global define, window, document */
12+
/* global define, window, document */
1413

1514
(function (factory) {
1615
'use strict';
@@ -64,8 +63,9 @@
6463
xhrUpload = options.xhr().upload;
6564
return {
6665
send: function (_, completeCallback) {
66+
counter += 1;
6767
var message = {
68-
id: 'postmessage-transport-' + (counter += 1)
68+
id: 'postmessage-transport-' + counter
6969
},
7070
eventName = 'message.' + message.id;
7171
iframe = $(

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
* https://github.com/jaubourg/ajaxHooks/
1313
*/
1414

15-
/*jslint unparam: true */
16-
/*global define, window, XDomainRequest */
15+
/* global define, window, XDomainRequest */
1716

1817
(function (factory) {
1918
'use strict';

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//= require jquery-fileupload/vendor/jquery.ui.widget
2+
//= require jquery-fileupload/vendor/tmpl
3+
//= require jquery-fileupload/vendor/load-image.all.min
4+
//= require jquery-fileupload/vendor/canvas-to-blob
5+
//= require jquery-fileupload/jquery.iframe-transport
6+
//= require jquery-fileupload/jquery.fileupload
7+
//= require jquery-fileupload/jquery.fileupload-process
8+
//= require jquery-fileupload/jquery.fileupload-image
9+
//= require jquery-fileupload/jquery.fileupload-audio
10+
//= require jquery-fileupload/jquery.fileupload-video
11+
//= require jquery-fileupload/jquery.fileupload-validate
12+
//= require jquery-fileupload/jquery.fileupload-ui
13+
//= require jquery-fileupload/locale

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//= require jquery-fileupload/vendor/tmpl
2+
//= require jquery-fileupload/vendor/load-image.all.min
3+
//= require jquery-fileupload/vendor/canvas-to-blob
4+
//= require jquery-fileupload/jquery.iframe-transport
5+
//= require jquery-fileupload/jquery.fileupload
6+
//= require jquery-fileupload/jquery.fileupload-process
7+
//= require jquery-fileupload/jquery.fileupload-image
8+
//= require jquery-fileupload/jquery.fileupload-audio
9+
//= require jquery-fileupload/jquery.fileupload-video
10+
//= require jquery-fileupload/jquery.fileupload-validate
11+
//= require jquery-fileupload/jquery.fileupload-ui
12+
//= require jquery-fileupload/jquery.fileupload-jquery-ui
13+
//= require jquery-fileupload/locale

0 commit comments

Comments
 (0)