jquery-rails_vho 0.0.2 → 0.0.3

data/lib/jquery-rails/engine.rb

@@ -4,7 +4,7 @@ module Jquery
 
     class Engine < ::Rails::Engine
       config.before_configuration do
-        require "jquery-rails/assert_select" if ::Rails.env.test?
+        require "jquery-rails/assert_select_jquery" if ::Rails.env.test?
       end
     end
 

data/lib/jquery-rails/version.rb

@@ -1,5 +1,5 @@
 module Jquery
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -79,7 +79,7 @@
     fire: function(obj, name, data) {
       var event = $.Event(name);
       obj.trigger(event, data);
-      return event.result !== false;
+      return event;
     },
 
     // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm
@@ -94,13 +94,13 @@
 
     // Submits "remote" forms and links with ajax
     handleRemote: function(element) {
-      var method, url, data,
-        dataType = event.data_type || element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-      if (rails.fire(element, 'ajax:before')) {
-
+      var method, url, data, dataType;
+        
+      var event = rails.fire(element, 'ajax:before'); 
+      if (event.result !== false) {
+        dataType = event.data_type || element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType); 
+        method  = event.data_method || element.attr('method') || element.attr('data-method') || 'GET'
         if (element.is('form')) {
-          method = event.data_method || element.attr('method') || element.attr('data-method');
           url = event.data_url || element.attr('action');
           data = element.serializeArray();
           // memoized value from clicked submit button
@@ -110,8 +110,7 @@
             element.data('ujs:submit-button', null);
           }
         } else {
-          method = element.data('method');
-          url = element.attr('href');
+          url = event.data_url || element.attr('href');
           data = element.data('params') || null; 
        }
 
@@ -119,10 +118,10 @@
           url: url, type: method || 'GET', data: data, dataType: dataType,
           // stopping the "ajax:beforeSend" event will cancel the ajax request
           beforeSend: function(xhr, settings) {
-            if (settings.dataType === undefined) {
+            if (settings.dataType === undefined || settings.dataType === 'text') {
               xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
             }
-            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
+            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]).result !== false;
           },
           success: function(data, status, xhr) {
             element.trigger('ajax:success', [data, status, xhr]);
@@ -196,9 +195,9 @@
           answer = false, callback;
       if (!message) { return true; }
 
-      if (rails.fire(element, 'confirm')) {
+      if (rails.fire(element, 'confirm').result !== false) {
         answer = rails.confirm(message);
-        callback = rails.fire(element, 'confirm:complete', [answer]);
+        callback = rails.fire(element, 'confirm:complete', [answer]).result !== false;
       }
       return answer && callback;
     },
@@ -271,13 +270,13 @@
     if (!rails.allowAction(form)) return rails.stopEverything(e);
 
     // skip other logic when required values are missing or file upload is present
-    if (blankRequiredInputs && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
+    if (blankRequiredInputs && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs]).result !== false) {
       return rails.stopEverything(e);
     }
 
     if (remote) {
       if (nonBlankFileInputs) {
-        return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+        return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]).result !== false;
       }
 
       // If browser does not support submit bubbling, then this live-binding will be called before direct

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-rails_vho
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +02:00
+date: 2011-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 14
@@ -54,6 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -69,6 +73,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         - 1
@@ -121,6 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -129,6 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3