blueimp-file-upload-rails 8.5.0 → 8.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b724168c1d92965dbcb096ab2f8dd47b7ad1013e
-  data.tar.gz: fd6d388cf58a4b2342e8526955600d54ed407ee8
+  metadata.gz: 5ac4ce577d2cce5ea2da30624a542252ffe0f21d
+  data.tar.gz: 5848cd19228a2c8827443fd7c1eb8920d85552f1
 SHA512:
-  metadata.gz: 1ca334804763e0de86cecc121e9b28041c95461f1552308c2952229ce17698875ff0797334fa0d6eecfbe225f02f062642f2fb293090755894616aeb90b354a2
-  data.tar.gz: 4eb64c449e6ab193ea97dcb6176a40c02dbdefafc6dc7c6df57c20941863d4deedcd4d7d54b105af6b2adc4a005bf26bfa2b6480b7200a971d6d0a8e13d6fec8
+  metadata.gz: f45b95954d0979c02ea82201f0d4f47404daa6921c95b58c45864f0a63765a2719843abfbacd1562f45fc985c7439751ee9b748089d3b7607d099ce96cb46194
+  data.tar.gz: fdd80cb2e371bd4ff370357951cb5ee26fff27929c79f19007172dd032483f7d943e1a074c67e55e1e6b26e1f26a690f2c525cae67785e5f58d8d6019d0341cd

data/{vendor → app}/assets/javascripts/jquery.fileupload-angular.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload AngularJS Plugin 1.4.0
+ * jQuery File Upload AngularJS Plugin 1.4.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -296,7 +296,9 @@
                     'fileuploadprocessalways',
                     'fileuploadprocessstop'
                 ].join(' '), function (e, data) {
-                    $scope.$emit(e.type, data);
+                    if ($scope.$emit(e.type, data).defaultPrevented) {
+                        e.preventDefault();
+                    }
                 }).on('remove', function () {
                     // Remove upload methods from the scope,
                     // when the widget is removed:

data/{vendor → app}/assets/javascripts/jquery.fileupload-audio.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Audio Preview Plugin 1.0.2
+ * jQuery File Upload Audio Preview Plugin 1.0.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -35,9 +35,6 @@
     $.blueimp.fileupload.prototype.options.processQueue.unshift(
         {
             action: 'loadAudio',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
             // Use the action as prefix for the "@" options:
             prefix: true,
             fileTypes: '@',
@@ -73,9 +70,7 @@
                 if (options.disabled) {
                     return data;
                 }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred(),
+                var file = data.files[data.index],
                     url,
                     audio;
                 if (this._audioElement.canPlayType &&
@@ -90,12 +85,10 @@
                         audio.src = url;
                         audio.controls = true;
                         data.audio = audio;
-                        dfd.resolveWith(that, [data]);
-                        return dfd.promise();
+                        return data;
                     }
                 }
-                dfd.rejectWith(that, [data]);
-                return dfd.promise();
+                return data;
             },
 
             // Sets the audio element as a property of the file object:

data/{vendor → app}/assets/javascripts/jquery.fileupload-image.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Image Preview & Resize Plugin 1.2.2
+ * jQuery File Upload Image Preview & Resize Plugin 1.2.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -39,9 +39,6 @@
     $.blueimp.fileupload.prototype.options.processQueue.unshift(
         {
             action: 'loadImageMetaData',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
             disableImageHead: '@',
             disableExif: '@',
             disableExifThumbnail: '@',
@@ -79,9 +76,6 @@
         },
         {
             action: 'resizeImage',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
             // Use "preview" as prefix for the "@" options:
             prefix: 'preview',
             maxWidth: '@',
@@ -154,15 +148,14 @@
                         !loadImage(
                             file,
                             function (img) {
-                                if (!img.src) {
-                                    return dfd.rejectWith(that, [data]);
+                                if (img.src) {
+                                    data.img = img;
                                 }
-                                data.img = img;
                                 dfd.resolveWith(that, [data]);
                             },
                             options
                         )) {
-                    dfd.rejectWith(that, [data]);
+                    return data;
                 }
                 return dfd.promise();
             },

data/{vendor → app}/assets/javascripts/jquery.fileupload-video.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Video Preview Plugin 1.0.2
+ * jQuery File Upload Video Preview Plugin 1.0.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -35,9 +35,6 @@
     $.blueimp.fileupload.prototype.options.processQueue.unshift(
         {
             action: 'loadVideo',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
             // Use the action as prefix for the "@" options:
             prefix: true,
             fileTypes: '@',
@@ -73,9 +70,7 @@
                 if (options.disabled) {
                     return data;
                 }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred(),
+                var file = data.files[data.index],
                     url,
                     video;
                 if (this._videoElement.canPlayType &&
@@ -90,12 +85,10 @@
                         video.src = url;
                         video.controls = true;
                         data.video = video;
-                        dfd.resolveWith(that, [data]);
-                        return dfd.promise();
+                        return data;
                     }
                 }
-                dfd.rejectWith(that, [data]);
-                return dfd.promise();
+                return data;
             },
 
             // Sets the video element as a property of the file object:

data/{vendor → app}/assets/javascripts/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.32.0
+ * jQuery File Upload Plugin 5.32.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -32,7 +32,7 @@
     $.support.fileInput = !(new RegExp(
         // Handle devices which give false positives for the feature detection:
         '(Android (1\\.[0156]|2\\.[01]))' +
-            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)' +
+            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
             '|(w(eb)?OSBrowser)|(webOS)' +
             '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
     ).test(window.navigator.userAgent) ||

data/lib/blueimp-file-upload-rails/version.rb

@@ -5,7 +5,7 @@ module Blueimp
       class Version
         class << self
           def to_s
-            "8.5.0"
+            "8.6.1"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueimp-file-upload-rails
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.6.1
 platform: ruby
 authors:
 - Sebastian Tschan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -112,23 +112,23 @@ extra_rdoc_files: []
 files:
 - lib/blueimp-file-upload-rails.rb
 - lib/blueimp-file-upload-rails/version.rb
-- vendor/assets/images/loading.gif
-- vendor/assets/images/progressbar.gif
-- vendor/assets/javascripts/blueimp-file-upload-basic-plus-ui.js
-- vendor/assets/javascripts/cors/jquery.postmessage-transport.js
-- vendor/assets/javascripts/cors/jquery.xdr-transport.js
-- vendor/assets/javascripts/jquery.fileupload-angular.js
-- vendor/assets/javascripts/jquery.fileupload-audio.js
-- vendor/assets/javascripts/jquery.fileupload-image.js
-- vendor/assets/javascripts/jquery.fileupload-process.js
-- vendor/assets/javascripts/jquery.fileupload-ui.js
-- vendor/assets/javascripts/jquery.fileupload-validate.js
-- vendor/assets/javascripts/jquery.fileupload-video.js
-- vendor/assets/javascripts/jquery.fileupload.js
-- vendor/assets/javascripts/jquery.iframe-transport.js
-- vendor/assets/stylesheets/blueimp-file-upload.css
-- vendor/assets/stylesheets/jquery.fileupload-ui-noscript.css
-- vendor/assets/stylesheets/jquery.fileupload-ui.css.erb
+- app/assets/images/loading.gif
+- app/assets/images/progressbar.gif
+- app/assets/javascripts/blueimp-file-upload-basic-plus-ui.js
+- app/assets/javascripts/cors/jquery.postmessage-transport.js
+- app/assets/javascripts/cors/jquery.xdr-transport.js
+- app/assets/javascripts/jquery.fileupload-angular.js
+- app/assets/javascripts/jquery.fileupload-audio.js
+- app/assets/javascripts/jquery.fileupload-image.js
+- app/assets/javascripts/jquery.fileupload-process.js
+- app/assets/javascripts/jquery.fileupload-ui.js
+- app/assets/javascripts/jquery.fileupload-validate.js
+- app/assets/javascripts/jquery.fileupload-video.js
+- app/assets/javascripts/jquery.fileupload.js
+- app/assets/javascripts/jquery.iframe-transport.js
+- app/assets/stylesheets/blueimp-file-upload.css
+- app/assets/stylesheets/jquery.fileupload-ui-noscript.css
+- app/assets/stylesheets/jquery.fileupload-ui.css.erb
 - app/models/blueimp/file_upload/file.rb
 - app/views/blueimp/_file_upload.html.erb
 - app/views/blueimp/_file_upload_templates.html.erb