jquery-rails 1.0.17 → 1.0.18

data/.gitignore

@@ -1,4 +1,7 @@
 pkg/*
 tmp
 spec/support/*/Gemfile.lock
-spec/support/*/public/javascripts
+spec/support/*/public/javascripts
+.rvmrc
+.bundle
+imports/*

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.18 (18 November 2011)
+
+  - Updated to latest jquery-ujs
+    - Fixed event parameter for form submit event handlers in IE for
+      jQuery 1.6.x
+    - Fixed form submit event handlers for jQuery 1.7
+
 ## 1.0.17 (9 November 2011)
 
   - Updated to jQuery 1.7

data/README.md

@@ -1,12 +1,17 @@
-# Jquery-rails
+# jquery-rails
 
 jQuery! For Rails! So great.
 
-Also provided is Sam Ruby's assert_select_jquery function, which is automatically included for use in tests.
+This gem provides:
+
+* jQuery 1.7
+* jQuery UI 1.8.16
+* the latest jQuery UJS adapter
+* and Sam Ruby's assert_select_jquery function, which is automatically included for use in tests.
 
 ## Rails 3.1
 
-This gem vendors jQuery 1.6 and the latest jQuery UJS adapter for Rails 3.1 and greater. The files will be added to the asset pipeline and available for you to use. These two lines will be added to the file `app/assets/javascripts/application.js` by default:
+For Rails 3.1 and greater, the files will be added to the asset pipeline and available for you to use. These two lines will be added to the file `app/assets/javascripts/application.js` by default:
 
     //= require jquery
     //= require jquery_ujs
@@ -41,4 +46,4 @@ Then, run `bundle install`. To invoke the generator, run:
 
     rails generate jquery:install #--ui to enable jQuery UI
 
-You're done!
+You're done!

data/lib/generators/jquery/install/install_generator.rb

@@ -1,6 +1,7 @@
 require 'rails'
 
-if ::Rails.version < "3.1"
+# Supply generator for Rails 3.0.x or if asset pipeline is not enabled
+if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
   module Jquery
     module Generators
       class InstallGenerator < ::Rails::Generators::Base
@@ -45,9 +46,11 @@ else
         desc "Just show instructions so people will know what to do when mistakenly using generator for Rails 3.1 apps"
 
         def do_nothing
-          say_status("deprecated", "You are using Rails 3.1, so this generator is no longer needed. The necessary files are already in your asset pipeline.")
+          say_status("deprecated", "You are using Rails 3.1 with the asset pipeline enabled, so this generator is not needed.")
+          say_status("", "The necessary files are already in your asset pipeline.")
           say_status("", "Just add `//= require jquery` and `//= require jquery_ujs` to your app/assets/javascripts/application.js")
           say_status("", "If you upgraded your app from Rails 3.0 and still have jquery.js, rails.js, or jquery_ujs.js in your javascripts, be sure to remove them.")
+          say_status("", "If you do not want the asset pipeline enabled, you may turn it off in application.rb and re-run this generator.")
           # ok, nothing
         end
       end

data/lib/jquery/rails/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    VERSION = "1.0.17"
+    VERSION = "1.0.18"
     JQUERY_VERSION = "1.7.0"
     JQUERY_UI_VERSION  = "1.8.16"
-    JQUERY_UJS_VERSION = "17f4004310b6ece3cb240914932b4d6d46032c24"
+    JQUERY_UJS_VERSION = "4fe37537cb2d8e71005303d3acb469e6205d26db"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -252,11 +252,11 @@
 
     // 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) {
+    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(obj.data);
+          if (typeof obj.handler === 'function') return continuePropagation = obj.handler(event);
         });
       }
       return continuePropagation;
@@ -335,7 +335,7 @@
 
       // 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 && rails.callFormSubmitBindings(form) === false) return rails.stopEverything(e);
+      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: 1.0.17
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2153494800 !ruby/object:Gem::Requirement
+  requirement: &2160594960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153494800
+  version_requirements: *2160594960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153493780 !ruby/object:Gem::Requirement
+  requirement: &2160590660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2153493780
+  version_requirements: *2160590660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153492640 !ruby/object:Gem::Requirement
+  requirement: &2160590180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153492640
+  version_requirements: *2160590180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153491940 !ruby/object:Gem::Requirement
+  requirement: &2160589720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2153491940
+  version_requirements: *2160589720
 description: This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.
 email:
 - andre@arko.net
@@ -96,9 +96,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -744928478964605964
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: jquery-rails
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use jQuery with Rails 3