From 4ee380eb989c09f6e523d502ee3776eacca0ab77 Mon Sep 17 00:00:00 2001 From: macintosh Date: Sat, 26 Mar 2016 05:41:01 +0300 Subject: [PATCH 1/3] updated to 9.12.1 && Jcrop 2.0.4 --- README.md | 13 +- lib/jquery/fileupload/rails/version.rb | 2 +- public/cors/postmessage.html | 4 +- public/cors/result.html | 2 +- .../javascripts/jquery-fileupload/basic.js | 1 + .../cors/jquery.postmessage-transport.js | 8 +- .../cors/jquery.xdr-transport.js | 8 +- .../javascripts/jquery-fileupload/index.js | 9 +- .../jquery.fileupload-angular.js | 196 ++--- .../jquery.fileupload-audio.js | 12 +- .../jquery.fileupload-image.js | 100 ++- .../jquery.fileupload-jquery-ui.js | 23 +- .../jquery.fileupload-process.js | 21 +- .../jquery-fileupload/jquery.fileupload-ui.js | 122 ++- .../jquery.fileupload-validate.js | 23 +- .../jquery.fileupload-video.js | 12 +- .../jquery-fileupload/jquery.fileupload.js | 291 +++++-- .../jquery.iframe-transport.js | 36 +- .../vendor/canvas-to-blob.min.js | 3 +- .../vendor/jquery.Jcrop.min.js | 22 - .../vendor/jquery.ui.widget.js | 150 ++-- .../vendor/load-image-exif-map.js | 721 +++++++++--------- .../vendor/load-image-exif.js | 549 ++++++------- .../vendor/load-image-ios.js | 181 ----- .../vendor/load-image-meta.js | 240 +++--- .../vendor/load-image-orientation.js | 298 ++++---- .../jquery-fileupload/vendor/load-image.js | 568 ++++++++------ .../vendor/load-image.min.js | 1 - .../jquery-fileupload/vendor/tmpl.min.js | 3 +- .../stylesheets/jquery.fileupload-ui.css.scss | 17 +- .../vendor/jquery.Jcrop.min.css.scss | 29 - 31 files changed, 1940 insertions(+), 1725 deletions(-) delete mode 100755 vendor/assets/javascripts/jquery-fileupload/vendor/jquery.Jcrop.min.js delete mode 100755 vendor/assets/javascripts/jquery-fileupload/vendor/load-image-ios.js delete mode 100755 vendor/assets/javascripts/jquery-fileupload/vendor/load-image.min.js delete mode 100755 vendor/assets/stylesheets/vendor/jquery.Jcrop.min.css.scss diff --git a/README.md b/README.md index cc7054b..b25fee2 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# jQuery File Upload for Rails +# jQuery File Upload for Rails (updated at Feb'2016) [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. @@ -6,11 +6,8 @@ jquery-fileupload-rails is a library that integrates jQuery File Upload for Rail ## Plugin versions -* jQuery File Upload User Interface Plugin 8.8.6 -* jQuery File Upload Plugin 5.32.6 -* jQuery UI Widget 1.10.3+amd -* JavaScript Load Image 1.9.0 -* Jcrop v0.9.12 (build:20130202) (optional) +* jQuery File Upload 9.12.1 +* Jcrop v2.0.4 (build:20151117) (optional) ## Installing Gem @@ -45,7 +42,7 @@ The snippet above will add the following js files to the mainfest file. To add [Jcrop](https://github.com/tapmodo/Jcrop) scripts: - //= require jquery-fileupload/vendor/jquery.Jcrop.min + //= require jquery-fileupload/vendor/Jcrop.min 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) @@ -65,7 +62,7 @@ Require the stylesheet file to app/assets/stylesheets/application.css [Jcrop](https://github.com/tapmodo/Jcrop) stylesheet - *= require vendor/jquery.Jcrop.min + *= require vendor/Jcrop.min ## Using the middleware diff --git a/lib/jquery/fileupload/rails/version.rb b/lib/jquery/fileupload/rails/version.rb index 83e8d80..ef101d0 100755 --- a/lib/jquery/fileupload/rails/version.rb +++ b/lib/jquery/fileupload/rails/version.rb @@ -1,7 +1,7 @@ module JQuery module FileUpload module Rails - VERSION = "1.0.0" + VERSION = "2.0.0" end end end diff --git a/public/cors/postmessage.html b/public/cors/postmessage.html index 3d1448f..fab9d60 100755 --- a/public/cors/postmessage.html +++ b/public/cors/postmessage.html @@ -1,7 +1,7 @@