jquery-rails 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.1 (18 August 2012)
+
+  - Updated to latest jquery-ujs
+    - ajax:aborted:file bugfixes
+
 ## 2.1.0 (16 August 2012)
 
   - Updated to latest jquery-ujs

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jquery-rails (2.1.0)
+    jquery-rails (2.1.1)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
 

data/lib/jquery/rails/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
     JQUERY_VERSION = "1.8.0"
     JQUERY_UI_VERSION  = "1.8.23"
-    JQUERY_UJS_VERSION = "12da9fc2f175c8e445413b15cf6b685deb271d6e"
+    JQUERY_UJS_VERSION = "8b147fb023f0d13deebea750e7e9827b6d3bc8ba"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -257,7 +257,7 @@
         input = $(this);
         valueToCheck = input.is(':checkbox,:radio') ? input.is(':checked') : input.val();
         // If nonBlank and valueToCheck are both truthy, or nonBlank and valueToCheck are both falsey
-        if (valueToCheck == !!nonBlank) {
+        if (!valueToCheck === !nonBlank) {
           inputs = inputs.add(input);
         }
       });
@@ -366,8 +366,15 @@
 
       if (remote) {
         if (nonBlankFileInputs) {
+          // slight timeout so that the submit button gets properly serialized
+          // (make it easy for event handler to serialize form without disabled values)
           setTimeout(function(){ rails.disableFormElements(form); }, 13);
-          return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+          var aborted = rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+
+          // re-enable form elements if event bindings return false (canceling normal form submission)
+          if (!aborted) { setTimeout(function(){ rails.enableFormElements(form); }, 13); }
+
+          return aborted;
         }
 
         // If browser does not support submit bubbling, then this live-binding will be called before direct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000Z
+date: 2012-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70255489661820 !ruby/object:Gem::Requirement
+  requirement: &70258115296360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '5.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255489661820
+  version_requirements: *70258115296360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70255489671420 !ruby/object:Gem::Requirement
+  requirement: &70258115307300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,7 +35,7 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70255489671420
+  version_requirements: *70258115307300
 description: This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.
 email:
 - andre@arko.net
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 608793451572395296
+      hash: -2382731131632071468
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: