jquery.fileupload-rails 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjcxMzNlMTc1MjdhY2VjNGQyOWZjYmE3OWZjZTAzYWMzMGJhZTY1Mw==
-  data.tar.gz: !binary |-
-    NzgzMjg0NDY4YWIwNmM4MTUwOGE1MGI3NzViYTIxMWZlYzczMGU3Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MmRkNmNhOTE1MjcwMjA3NWI2Y2YwM2UzYzYxYmRlOGY3ODJhZWE5YWJmMGE2
-    NjZhM2MwYjJjMTA0MGYxNzk0OGFiNjkwMjc5OTQ2MmYyOWE0NmNmMjVkNzE5
-    YzA3MmYxMGRlNjZiZmE3NTMwNTczZWE5NWFkMDM2NjBjOTEyMTI=
-  data.tar.gz: !binary |-
-    NzFjMjU0YWU4MDViNGRhNDM1NzUzYmYzMmVhMDM3NTFjMjBjNzEyNTE4OTEx
-    OWFjYzNmNzJjYTE3NjUwNDNhOTE4MGE3MTM4MDg0NjE5N2U0NzI1NjhjNmM4
-    MWNiMzlhNjE2ZTljNTBjZDA5ZGM0ZjM1MDRmNjJkMDA0M2UzNzc=
+SHA1:
+  metadata.gz: 16084c99cdfdde377777825969f3f6201c885294
+  data.tar.gz: 100ce56a6aabdb42dfe00e83695dbf4c82b74d76
+SHA512:
+  metadata.gz: 254377c4607f2ef476bd24b66a4b8d9feb7ed5abda553b1e2bac34391239af9c7ffa124e0e2c8e3b4b1559e5e63dc6a33a66665edb6d11df3bccb12b1e12e91a
+  data.tar.gz: 52f9999f4eb8fe3d78c5ab074fbeba86dd4606931c38fbfc304866bb72cf9f98d072ea9070bad96a1157c4bde27f8ac1c0a57fa54d62b0fef9b0b1d3d2dc0e8a

data/Readme.md

@@ -41,6 +41,8 @@ If you downloaded jquery.ui assets into your project, delete them and use [jquer
 
 ## Changelog
 
+1.6.1. Core 5.32.5, jQuery UI Rails 4 compatibility.
+
 1.6.0. Core 5.32.2.
 
 1.5.1. Core 5.31.

data/demo/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.14'
 
 gem 'coffee-rails', '~> 3.2.1'
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 3.0.0'
+gem 'jquery-ui-rails', '~> 4.0.0'
 gem 'jquery.fileupload-rails', path: '..'

data/jquery.fileupload-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "jquery.fileupload-rails"
-  s.version     = "1.6.0"
+  s.version     = "1.6.1"
   s.author      = "Semyon Perepelitsa"
   s.email       = "sema@sema.in"
   s.homepage    = "https://github.com/semaperepelitsa/jquery.fileupload-rails"
@@ -13,5 +13,5 @@ Gem::Specification.new do |s|
   s.files       = File.read('Manifest.txt').split("\n")
 
   s.add_dependency 'railties', '>= 3.1'
-  s.add_dependency 'jquery-ui-rails', '~> 3.0'
+  s.add_dependency 'jquery-ui-rails', '>= 3.0', '< 5.0'
 end

data/vendor/assets/javascripts/jquery.fileupload.js

@@ -2,7 +2,7 @@
 //= require jquery.iframe-transport
 
 /*
- * jQuery File Upload Plugin 5.32.2
+ * jQuery File Upload Plugin 5.32.5
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -402,7 +402,7 @@
                 // Ignore non-multipart setting if not supported:
                 multipart = options.multipart || !$.support.xhrFileUpload,
                 paramName = options.paramName[0];
-            options.headers = options.headers || {};
+            options.headers = $.extend({}, options.headers);
             if (options.contentRange) {
                 options.headers['Content-Range'] = options.contentRange;
             }
@@ -1121,9 +1121,8 @@
                         data.files.push(file);
                     }
                 });
-                if (this._trigger('paste', e, data) === false ||
-                        this._onAdd(e, data) === false) {
-                    return false;
+                if (this._trigger('paste', e, data) !== false) {
+                    this._onAdd(e, data);
                 }
             }
         },
@@ -1146,13 +1145,15 @@
 
         _onDragOver: function (e) {
             e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var dataTransfer = e.dataTransfer;
-            if (dataTransfer) {
-                if (this._trigger('dragover', e) === false) {
-                    return false;
-                }
-                if ($.inArray('Files', dataTransfer.types) !== -1) {
-                    dataTransfer.dropEffect = 'copy';
+            var dataTransfer = e.dataTransfer,
+                data = {
+                    dropEffect: 'copy',
+                    preventDefault: true
+                };
+            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1 &&
+                    this._trigger('dragover', e, data) !== false) {
+                dataTransfer.dropEffect = data.dropEffect;
+                if (data.preventDefault) {
                     e.preventDefault();
                 }
             }

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: jquery.fileupload-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: railties
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: jquery-ui-rails
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: This gem packages jQuery File Upload plugin and it's dependencies for
   Rails asset pipeline.
 email: sema@sema.in
@@ -87,12 +93,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []