Skip to content

Commit 24528fc

Browse files
Bump to 1.0.0 with stuff:
- This is an experimental version of this plugin because the previous version has the version of this plugin sitting in September 2010, and we're running into some serious issues. THUS, since this commit will likely introduce many breaking changes, we're now at 1.0.0. Sure, why not. #yolo
1 parent 0ff3c5b commit 24528fc

23 files changed

+1338
-1216
lines changed

README.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# jQuery File Upload for Rails
22

3+
(modified by @imkmf)
4+
35
[jQuery-File-Plugin](https://github.com/blueimp/jQuery-File-Upload) is a file upload plugin written by [Sebastian Tschan](https://github.com/blueimp). jQuery File Upload features multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
46

57
jquery-fileupload-rails is a library that integrates jQuery File Upload for Rails 3.1 Asset Pipeline (Rails 3.2 supported).
68

79
## Plugin versions
810

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
11+
* jQuery File Upload User Interface Plugin 9.5.2
12+
* jQuery File Upload Plugin 5.40.1
13+
* jQuery UI Widget 1.10.4+amd
1214

1315
## Installing Gem
1416

@@ -22,15 +24,18 @@ Require jquery-fileupload in your app/assets/application.js file.
2224

2325
The snippet above will add the following js files to the mainfest file.
2426

25-
//= require jquery-fileupload/vendor/jquery.ui.widget
26-
//= require jquery-fileupload/vendor/load-image
27-
//= require jquery-fileupload/vendor/canvas-to-blob
28-
//= require jquery-fileupload/vendor/tmpl
29-
//= require jquery-fileupload/jquery.iframe-transport
30-
//= require jquery-fileupload/jquery.fileupload
31-
//= require jquery-fileupload/jquery.fileupload-fp
32-
//= require jquery-fileupload/jquery.fileupload-ui
33-
//= require jquery-fileupload/locale
27+
//= jquery-fileupload/cors/jquery.postmessage-transport
28+
//= jquery-fileupload/cors/jquery.xdr-transport
29+
//= jquery-fileupload/jquery.fileupload-angular
30+
//= jquery-fileupload/jquery.fileupload-audio
31+
//= jquery-fileupload/jquery.fileupload-image
32+
//= jquery-fileupload/jquery.fileupload-jquery-ui
33+
//= jquery-fileupload/jquery.fileupload-process
34+
//= jquery-fileupload/jquery.fileupload-ui
35+
//= jquery-fileupload/jquery.fileupload-validate
36+
//= jquery-fileupload/jquery.fileupload-video
37+
//= jquery-fileupload/jquery.fileupload
38+
//= jquery-fileupload/jquery.iframe-transport
3439

3540
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)
3641

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module JQuery
22
module FileUpload
33
module Rails
4-
VERSION = "0.4.1"
4+
VERSION = "1.0.0"
55
end
66
end
77
end

vendor/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 2 deletions
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';

vendor/assets/javascripts/jquery-fileupload/index.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)