client_side_validations 2.4.0 → 2.4.1

data/javascript/lib/client_side_validations.js

@@ -8,21 +8,20 @@ if (typeof(jQuery) != "undefined") {
     clientSideValidations: function() {
       var form      = this;
       var object    = form.attr('object-csv');
-      var id        = form[0].id;
+      var form_id   = form[0].id;
       var object_id = null;
       var adapter   = 'jquery.validate';
-      if (/new/.test(id)) {
-        id = /new_(\w+)/.exec(id)[1]
-      } else if (/edit/.test(id)) {
-        id        = /edit_(\w+)_\d+/.exec(id)[1]
-        object_id = /edit_\w+_(\d+)/.exec(id)[1]
+
+      if (/edit/.test(form_id)) {
+        object_id = /edit_\w+_(\d+)/.exec(form_id)[1];
       }
+      
       if (eval("typeof(" + object + "_validation_options)") != "undefined") {
         var options = eval(object + '_validation_options');
       } else {
         var options = { }
       }
-      var client          = new ClientSideValidations(id, adapter, object_id)
+      var client          = new ClientSideValidations(object, adapter, object_id)
       var rules           = eval(object + '_validation_rules');
       var validations     = client.adaptValidations(rules);
       options['rules']    = validations.rules;

data/lib/client_side_validations/adapters/active_model.rb

@@ -44,7 +44,7 @@ module DNCLabs
         private
         
         def can_validate?(validation)
-          if on = validation.options.delete(:on)
+          if on = validation.options[:on]
             on = on.to_sym
             (on == :save) ||
             (on == :create && base.new_record?) ||

data/lib/client_side_validations/adapters/active_record_2.rb

@@ -44,7 +44,7 @@ module DNCLabs
         private
         
         def can_validate?(validation)
-          if on = validation.options.delete(:on)
+          if on = validation.options[:on]
             on = on.to_sym
             (on == :save) ||
             (on == :create && base.new_record?) ||

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -04:00
+date: 2010-07-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency