Skip to content

Commit 4ee380e

Browse files
author
macintosh
committed
updated to 9.12.1 && Jcrop 2.0.4
1 parent 096553f commit 4ee380e

31 files changed

+1940
-1725
lines changed

‎README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
# jQuery File Upload for Rails
1+
# jQuery File Upload for Rails (updated at Feb'2016)
22

33
[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.
44

55
jquery-fileupload-rails is a library that integrates jQuery File Upload for Rails 3.1> Asset Pipeline (Rails 3.2 and 4.0 supported).
66

77
## Plugin versions
88

9-
* jQuery File Upload User Interface Plugin 8.8.6
10-
* jQuery File Upload Plugin 5.32.6
11-
* jQuery UI Widget 1.10.3+amd
12-
* JavaScript Load Image 1.9.0
13-
* Jcrop v0.9.12 (build:20130202) (optional)
9+
* jQuery File Upload 9.12.1
10+
* Jcrop v2.0.4 (build:20151117) (optional)
1411

1512
## Installing Gem
1613

@@ -45,7 +42,7 @@ The snippet above will add the following js files to the mainfest file.
4542

4643
To add [Jcrop](https://github.com/tapmodo/Jcrop) scripts:
4744

48-
//= require jquery-fileupload/vendor/jquery.Jcrop.min
45+
//= require jquery-fileupload/vendor/Jcrop.min
4946

5047
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)
5148

@@ -65,7 +62,7 @@ Require the stylesheet file to app/assets/stylesheets/application.css
6562

6663
[Jcrop](https://github.com/tapmodo/Jcrop) stylesheet
6764

68-
*= require vendor/jquery.Jcrop.min
65+
*= require vendor/Jcrop.min
6966

7067
## Using the middleware
7168

‎lib/jquery/fileupload/rails/version.rb

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 = "1.0.0"
4+
VERSION = "2.0.0"
55
end
66
end
77
end

‎public/cors/postmessage.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery File Upload Plugin postMessage API 1.2.1
4+
* jQuery File Upload Plugin postMessage API
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2011, Sebastian Tschan
@@ -72,4 +72,4 @@
7272
});
7373
</script>
7474
</body>
75-
</html>
75+
</html>

‎public/cors/result.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery Iframe Transport Plugin Redirect Page 2.0.1
4+
* jQuery Iframe Transport Plugin Redirect Page
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2010, Sebastian Tschan

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//= require jquery-fileupload/vendor/jquery.ui.widget
22
//= require jquery-fileupload/jquery.iframe-transport
33
//= require jquery-fileupload/jquery.fileupload
4+
//= require jquery-fileupload/locale
45

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery postMessage Transport Plugin 1.1.1
2+
* jQuery postMessage Transport Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan
@@ -9,14 +9,16 @@
99
* http://www.opensource.org/licenses/MIT
1010
*/
1111

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

1514
(function (factory) {
1615
'use strict';
1716
if (typeof define === 'function' && define.amd) {
1817
// Register as an anonymous AMD module:
1918
define(['jquery'], factory);
19+
} else if (typeof exports === 'object') {
20+
// Node/CommonJS:
21+
factory(require('jquery'));
2022
} else {
2123
// Browser globals:
2224
factory(window.jQuery);

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery XDomainRequest Transport Plugin 1.1.3
2+
* jQuery XDomainRequest Transport Plugin
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2011, Sebastian Tschan
@@ -12,14 +12,16 @@
1212
* https://github.com/jaubourg/ajaxHooks/
1313
*/
1414

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

1817
(function (factory) {
1918
'use strict';
2019
if (typeof define === 'function' && define.amd) {
2120
// Register as an anonymous AMD module:
2221
define(['jquery'], factory);
22+
} else if (typeof exports === 'object') {
23+
// Node/CommonJS:
24+
factory(require('jquery'));
2325
} else {
2426
// Browser globals:
2527
factory(window.jQuery);

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
//= require jquery-fileupload/vendor/jquery.ui.widget
22
//= require jquery-fileupload/vendor/tmpl.min
3-
//= require jquery-fileupload/vendor/load-image.min
4-
//= require jquery-fileupload/vendor/load-image-ios
5-
//= require jquery-fileupload/vendor/load-image-orientation
6-
//= require jquery-fileupload/vendor/load-image-meta
7-
//= require jquery-fileupload/vendor/load-image-exif
8-
//= require jquery-fileupload/vendor/load-image-exif-map
3+
//= require jquery-fileupload/vendor/load-image.all.min
94
//= require jquery-fileupload/vendor/canvas-to-blob.min
105
//= require jquery-fileupload/jquery.iframe-transport
116
//= require jquery-fileupload/jquery.fileupload
@@ -15,4 +10,4 @@
1510
//= require jquery-fileupload/jquery.fileupload-video
1611
//= require jquery-fileupload/jquery.fileupload-validate
1712
//= require jquery-fileupload/jquery.fileupload-ui
18-
//= require jquery-fileupload/locale
13+
//= require jquery-fileupload/locale

0 commit comments

Comments
 (0)