jquery-rails 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.2 (12 May 2011)
+
+  - Fix Rails 3.0 now that rails.js is named jquery_ujs.js
+
 ## 1.0.1 (10 May 2011)
 
   - Stop downloading rails.js from GitHub

data/README.md

@@ -15,6 +15,8 @@ If you wish to use jQuery UI as well, you can add this line to `application.js`:
 
     //= require jquery-ui
 
+In order to use the themed parts of jQuery UI, you will also need to supply your own theme CSS. See [jqueryui.com](http://jqueryui.com) for more information.
+
 ### Installation
 
 When you generate a new Rails 3.1 app, pass the `-j jquery` option, like this:

data/lib/jquery-rails/railtie.rb

@@ -17,9 +17,9 @@ module Jquery
         # at the end, because load order is important
         config.action_view.javascript_expansions[:defaults] -= PROTOTYPE_JS + ['rails']
         config.action_view.javascript_expansions[:defaults] |= jq_defaults
-        config.action_view.javascript_expansions[:defaults] << 'rails'
+        config.action_view.javascript_expansions[:defaults] << 'jquery_ujs'
       end
     end
 
   end
-end
+end

data/lib/jquery-rails/version.rb

@@ -1,5 +1,5 @@
 module Jquery
   module Rails
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -82,6 +82,16 @@
       return event.result !== false;
     },
 
+    // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm
+    confirm: function(message) {
+      return confirm(message);
+    },
+
+    // Default ajax function, may be overridden with custom function in $.rails.ajax
+    ajax: function(options) {
+      return $.ajax(options);
+    },
+
     // Submits "remote" forms and links with ajax
     handleRemote: function(element) {
       var method, url, data,
@@ -105,7 +115,7 @@
           data = null;
         }
 
-        $.ajax({
+        rails.ajax({
           url: url, type: method || 'GET', data: data, dataType: dataType,
           // stopping the "ajax:beforeSend" event will cancel the ajax request
           beforeSend: function(xhr, settings) {
@@ -171,11 +181,27 @@
       });
     },
 
-    // If message provided in 'data-confirm' attribute, fires `confirm` event and returns result of confirm dialog.
-    // Attaching a handler to the element's `confirm` event that returns false cancels the confirm dialog.
+    /*
+	 For 'data-confirm' attribute:
+       - fires `confirm` event
+       - shows the confirmation dialog
+       - fires the `confirm:complete` event
+
+     Returns `true` if no function stops the chain and user chose yes; `false` otherwise.
+	 Attaching a handler to the element's `confirm` event that returns a `falsy` value cancels the confirmation dialog.
+	 Attaching a handler to the element's `confirm:complete` event that returns a `falsy` value makes this function
+	 return false.
+    */
     allowAction: function(element) {
-      var message = element.data('confirm');
-      return !message || (rails.fire(element, 'confirm') && confirm(message));
+      var message = element.data('confirm'),
+          answer = false, callback;
+      if (!message) { return true; }
+
+      if (rails.fire(element, 'confirm')) {
+        answer = rails.confirm(message);
+        callback = rails.fire(element, 'confirm:complete', [answer]);
+      }
+      return answer && callback;
     },
 
     // Helper function which checks for blank inputs in a form that match the specified CSS selector

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-rails
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -07:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency