jquery-rails 1.0.13 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.14 (08 September 2011)
+
+  - Updated to latest jquery-ujs
+    - Added `disable-with` support for links
+    - minor bug fixes
+    - Added `data-remote` support for change events of all input types
+  - Added install generator for Rails 3.1 with instructional message
+
 ## 1.0.13 (11 August 2011)
 
   - Updated to latest jquery-ujs with `novalidate` support

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

@@ -1,39 +1,56 @@
 require 'rails'
 
-module Jquery
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
+if ::Rails.version < "3.1"
+  module Jquery
+    module Generators
+      class InstallGenerator < ::Rails::Generators::Base
 
-      desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION}, jQuery-ujs, and (optionally) jQuery UI #{Jquery::Rails::JQUERY_UI_VERSION}"
-      class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
-      source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
+        desc "This generator installs jQuery #{Jquery::Rails::JQUERY_VERSION}, jQuery-ujs, and (optionally) jQuery UI #{Jquery::Rails::JQUERY_UI_VERSION}"
+        class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
+        source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
 
-      def remove_prototype
-        Rails::PROTOTYPE_JS.each do |name|
-          remove_file "public/javascripts/#{name}.js"
+        def remove_prototype
+          Rails::PROTOTYPE_JS.each do |name|
+            remove_file "public/javascripts/#{name}.js"
+          end
         end
-      end
 
-      def copy_jquery
-        say_status("copying", "jQuery (#{Jquery::Rails::JQUERY_VERSION})", :green)
-        copy_file "jquery.js", "public/javascripts/jquery.js"
-        copy_file "jquery.min.js", "public/javascripts/jquery.min.js"
-      end
+        def copy_jquery
+          say_status("copying", "jQuery (#{Jquery::Rails::JQUERY_VERSION})", :green)
+          copy_file "jquery.js", "public/javascripts/jquery.js"
+          copy_file "jquery.min.js", "public/javascripts/jquery.min.js"
+        end
 
-      def copy_jquery_ui
-        if options.ui?
-          say_status("copying", "jQuery UI (#{Jquery::Rails::JQUERY_UI_VERSION})", :green)
-          copy_file "jquery-ui.js", "public/javascripts/jquery-ui.js"
-          copy_file "jquery-ui.min.js", "public/javascripts/jquery-ui.min.js"
+        def copy_jquery_ui
+          if options.ui?
+            say_status("copying", "jQuery UI (#{Jquery::Rails::JQUERY_UI_VERSION})", :green)
+            copy_file "jquery-ui.js", "public/javascripts/jquery-ui.js"
+            copy_file "jquery-ui.min.js", "public/javascripts/jquery-ui.min.js"
+          end
+        end
+
+        def copy_ujs_driver
+          say_status("copying", "jQuery UJS adapter (#{Jquery::Rails::JQUERY_UJS_VERSION[0..5]})", :green)
+          remove_file "public/javascripts/rails.js"
+          copy_file "jquery_ujs.js", "public/javascripts/jquery_ujs.js"
         end
-      end
 
-      def copy_ujs_driver
-        say_status("copying", "jQuery UJS adapter (#{Jquery::Rails::JQUERY_UJS_VERSION[0..5]})", :green)
-        remove_file "public/javascripts/rails.js"
-        copy_file "jquery_ujs.js", "public/javascripts/jquery_ujs.js"
       end
+    end
+  end
+else
+  module Jquery
+    module Generators
+      class InstallGenerator < ::Rails::Generators::Base
+        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("", "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.")
+          # ok, nothing
+        end
+      end
     end
   end
-end if ::Rails.version < "3.1"
+end

data/lib/jquery/assert_select.rb

@@ -52,7 +52,7 @@ module ActionDispatch
 
         pattern = "\\.#{jquery_method || '\\w+'}\\("
         pattern = "#{pattern}['\"]#{jquery_opt}['\"],?\\s*" if jquery_opt
-        pattern = "#{pattern}#{PATTERN_HTML}" if block
+        pattern = "#{pattern}#{PATTERN_HTML}"
         pattern = "(?:jQuery|\\$)\\(['\"]#{id}['\"]\\)#{pattern}" if id
 
         fragments = []
@@ -84,6 +84,7 @@ module ActionDispatch
       def unescape_js(js_string)
         # js encodes double quotes and line breaks.
         unescaped= js_string.gsub('\"', '"')
+        unescaped.gsub!('\\\'', "'")
         unescaped.gsub!(/\\\//, '/')
         unescaped.gsub!('\n', "\n")
         unescaped.gsub!('\076', '>')
@@ -95,4 +96,4 @@ module ActionDispatch
 
     end
   end
-end
+end

data/lib/jquery/rails/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    VERSION = "1.0.13"
+    VERSION = "1.0.14"
     JQUERY_VERSION = "1.6.2"
     JQUERY_UI_VERSION  = "1.8.14"
-    JQUERY_UJS_VERSION = "cd619df9f0daad3303aacd4f992fff19158b1e5d"
+    JQUERY_UJS_VERSION = "c00a9726837756ea53404ca7e8b0f12df19a6496"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -49,10 +49,10 @@
 
   $.rails = rails = {
     // Link elements bound by jquery-ujs
-    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote]',
+    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]',
 
 		// Select elements bound by jquery-ujs
-		selectChangeSelector: 'select[data-remote]',
+		inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
 
     // Form elements bound by jquery-ujs
     formSubmitSelector: 'form',
@@ -72,6 +72,9 @@
     // Form file input elements
     fileInputSelector: 'input:file',
 
+    // Link onClick disable selector with possible reenable after remote submission
+    linkDisableSelector: 'a[data-disable-with]',
+
     // Make sure that every Ajax request sends the CSRF token
     CSRFProtection: function(xhr) {
       var token = $('meta[name="csrf-token"]').attr('content');
@@ -99,7 +102,8 @@
     handleRemote: function(element) {
       var method, url, data,
         crossDomain = element.data('cross-domain') || null,
-        dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+        dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType),
+        options;
 
       if (rails.fire(element, 'ajax:before')) {
 
@@ -113,15 +117,15 @@
             data.push(button);
             element.data('ujs:submit-button', null);
           }
-        } else if (element.is('select')) {
+        } else if (element.is(rails.inputChangeSelector)) {
           method = element.data('method');
           url = element.data('url');
           data = element.serialize();
-          if (element.data('params')) data = data + "&" + element.data('params'); 
+          if (element.data('params')) data = data + "&" + element.data('params');
         } else {
-           method = element.data('method');
-           url = element.attr('href');
-           data = element.data('params') || null; 
+          method = element.data('method');
+          url = element.attr('href');
+          data = element.data('params') || null;
         }
 
         options = {
@@ -143,8 +147,8 @@
             element.trigger('ajax:error', [xhr, status, error]);
           }
         };
-        // Do not pass url to `ajax` options if blank
-        if (url) { $.extend(options, { url: url }); }
+        // Only pass url to `ajax` options if not blank
+        if (url) { options.url = url; }
 
         rails.ajax(options);
       }
@@ -252,15 +256,43 @@
         });
       }
       return continuePropagation;
+    },
+
+    //  replace element's html with the 'data-disable-with' after storing original html
+    //  and prevent clicking on it
+    disableElement: function(element) {
+      element.data('ujs:enable-with', element.html()); // store enabled state
+      element.html(element.data('disable-with')); // set to disabled state
+      element.bind('click.railsDisable', function(e) { // prevent further clicking
+        return rails.stopEverything(e)
+      });
+    },
+
+    // restore element to its original state which was disabled by 'disableElement' above
+    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.unbind('click.railsDisable'); // enable element
     }
+
   };
 
   $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
 
+  $(rails.linkDisableSelector).live('ajax:complete', function() {
+      rails.enableElement($(this));
+  });
+
   $(rails.linkClickSelector).live('click.rails', function(e) {
     var link = $(this);
     if (!rails.allowAction(link)) return rails.stopEverything(e);
 
+    if (link.is(rails.linkDisableSelector)) rails.disableElement(link);
+
     if (link.data('remote') !== undefined) {
       rails.handleRemote(link);
       return false;
@@ -270,13 +302,13 @@
     }
   });
 
-	$(rails.selectChangeSelector).live('change.rails', function(e) {
+	$(rails.inputChangeSelector).live('change.rails', function(e) {
     var link = $(this);
     if (!rails.allowAction(link)) return rails.stopEverything(e);
 
     rails.handleRemote(link);
     return false;
-  });	
+  });
 
   $(rails.formSubmitSelector).live('submit.rails', function(e) {
     var form = $(this),

metadata

@@ -2,7 +2,7 @@
 name: jquery-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties