jquery-rails 2.2.1 → 2.2.2

data/.gitignore

@@ -2,7 +2,7 @@ pkg/*
 tmp
 spec/support/*/Gemfile.lock
 spec/support/*/public/javascripts
-.rvmrc
+.ruby-version
 .bundle
 imports/*
 Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.2 (29 May 2013)
+
+  - Updated to latest jquery-ujs
+
 ## 2.2.1 (08 February 2013)
 
   - Updated to jQuery 1.9.1

data/Rakefile

@@ -1,2 +1,22 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+# Check if versions are correct between VERSION constants and .js files
+#
+task :release => [:guard_version]
+
+task :guard_version do
+  def check_version(file, pattern, constant)
+    body = File.read("vendor/assets/javascripts/#{file}")
+    match = body.match(pattern) or abort "Version check failed: no pattern matched in #{file}"
+    file_version = body.match(pattern)[1]
+    constant_version = Jquery::Rails.const_get(constant)
+
+    unless constant_version == file_version
+      abort "Jquery::Rails::#{constant} was #{constant_version} but it should be #{file_version}"
+    end
+  end
+
+  check_version('jquery.js', /jQuery JavaScript Library v([\S]+)/, 'JQUERY_VERSION')
+  check_version('jquery-ui.js', /jQuery UI - v([\S]+)/, 'JQUERY_UI_VERSION')
+end

data/lib/jquery/rails/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
     JQUERY_VERSION = "1.9.1"
     JQUERY_UI_VERSION  = "1.9.2"
-    JQUERY_UJS_VERSION = "aab2251d90afbdfc808d8031312d063b1ccf8f6f"
+    JQUERY_UJS_VERSION = "87587d476054e9869865f53c1b78cb8164619a05"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -10,14 +10,9 @@
  *
  */
 
-  // Cut down on the number if issues from people inadvertently including jquery_ujs twice
+  // Cut down on the number of issues from people inadvertently including jquery_ujs twice
   // by detecting and raising an error when it happens.
-  var alreadyInitialized = function() {
-    var events = $._data(document, 'events');
-    return events && events.click && $.grep(events.click, function(e) { return e.namespace === 'rails'; }).length;
-  }
-
-  if ( alreadyInitialized() ) {
+  if ( $.rails !== undefined ) {
     $.error('jquery-ujs has already been loaded!');
   }
 
@@ -28,6 +23,9 @@
     // Link elements bound by jquery-ujs
     linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]',
 
+    // Button elements boud jquery-ujs
+    buttonClickSelector: 'button[data-remote]',
+
     // Select elements bound by jquery-ujs
     inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
 
@@ -105,6 +103,11 @@
           url = element.data('url');
           data = element.serialize();
           if (element.data('params')) data = data + "&" + element.data('params');
+        } else if (element.is(rails.buttonClickSelector)) {
+          method = element.data('method') || 'get';
+          url = element.data('url');
+          data = element.serialize();
+          if (element.data('params')) data = data + "&" + element.data('params');
         } else {
           method = element.data('method');
           url = rails.href(element);
@@ -255,18 +258,6 @@
       return false;
     },
 
-    // find all the submit events directly bound to the form and
-    // manually invoke them. If anyone returns false then stop the loop
-    callFormSubmitBindings: function(form, event) {
-      var events = form.data('events'), continuePropagation = true;
-      if (events !== undefined && events['submit'] !== undefined) {
-        $.each(events['submit'], function(i, obj){
-          if (typeof obj.handler === 'function') return continuePropagation = obj.handler(event);
-        });
-      }
-      return continuePropagation;
-    },
-
     //  replace element's html with the 'data-disable-with' after storing original html
     //  and prevent clicking on it
     disableElement: function(element) {
@@ -281,9 +272,7 @@
     enableElement: function(element) {
       if (element.data('ujs:enable-with') !== undefined) {
         element.html(element.data('ujs:enable-with')); // set to old enabled state
-        // this should be element.removeData('ujs:enable-with')
-        // but, there is currently a bug in jquery which makes hyphenated data attributes not get removed
-        element.data('ujs:enable-with', false); // clean up cache
+        element.removeData('ujs:enable-with'); // clean up cache
       }
       element.unbind('click.railsDisable'); // enable element
     }
@@ -322,6 +311,14 @@
       }
     });
 
+    $(document).delegate(rails.buttonClickSelector, 'click.rails', function(e) {
+      var button = $(this);
+      if (!rails.allowAction(button)) return rails.stopEverything(e);
+
+      rails.handleRemote(button);
+      return false;
+    });
+
     $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
       var link = $(this);
       if (!rails.allowAction(link)) return rails.stopEverything(e);
@@ -356,10 +353,6 @@
           return aborted;
         }
 
-        // If browser does not support submit bubbling, then this live-binding will be called before direct
-        // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
-        if (!$.support.submitBubbles && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e);
-
         rails.handleRemote(form);
         return false;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000Z
+date: 2013-05-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70229904418740 !ruby/object:Gem::Requirement
+  requirement: &70343408106200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '5.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229904418740
+  version_requirements: *70343408106200
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70229904425240 !ruby/object:Gem::Requirement
+  requirement: &70343408105460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,7 +38,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229904425240
+  version_requirements: *70343408105460
 description: This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.
 email:
 - andre@arko.net
@@ -79,9 +79,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3074731499898009030
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: