edifice 0.6.5 → 0.6.6

data/lib/edifice/version.rb

@@ -1,3 +1,3 @@
 module Edifice
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/public/javascripts/edifice/edifice_form.js

@@ -72,6 +72,14 @@ var methods = {
     }
   },
   
+  label_for: function($field) {
+    return this.find('label[for=' + $field.attr('id') + ']');
+  },
+  
+  error_on: function($field) {
+    return this.label_for($field).parents('.field_with_errors').next('.formError');
+  },
+  
   has_error: function($field) {
     return $field.parent('.field_with_errors').length > 0;
   },

data/lib/public/javascripts/edifice/form.js

@@ -28,6 +28,8 @@ function form() {
 }
 var methods = {
   initialize: function() {
+    // I don't know why, but FF seems to helpful remember that these are disabled
+    this.submits().removeAttr('disabled');
     this.prepare_validators();
     this.prepare_submit();
   },
@@ -47,7 +49,7 @@ var methods = {
     
     // listen to validator
     this.fields().live('change.ajax_form focusout.ajax_form', function() { 
-      $form.validate($(this)); 
+      if ($form.validate($(this)) === false) { $form.trigger('invalid', [$form, $(this)]); }
     });
   },
   
@@ -56,8 +58,7 @@ var methods = {
     this.submit(function(event) {
       // do pre-submit validations
       if (!$form.valid()) {
-        $form.trigger('invalid');
-        $form.focus_error();
+        $form.invalid();
         return false; // we are done.
       }
       
@@ -73,24 +74,24 @@ var methods = {
           cache: false,
           error: function (x, t, e) { $form.error(x, t, e); },
           success: function (data, status) {
-            $form.trigger('success', data, status);
+            $form.trigger('success', [data, status, $form]);
           },
           complete: function (request, text_status) {
-            $form.trigger('complete', request, text_status);
+            $form.trigger('complete', [request, text_status, $form]);
 
             $form.submits().removeAttr('disabled');
           }
         });        
         event.preventDefault();
-        return false;
       }
       
     });
   },
   
-   // focus the first error
-  focus_error: function() {
+  invalid: function() {
+    // focus the first error
     this.error_fields().eq(0).focus();
+    this.trigger('invalid', [this]);
   },
   
   error: function(request, text_status, error) {
@@ -99,7 +100,7 @@ var methods = {
     // handle the different possible errors that we can see
     if (request.status >= 400 && request.status < 500) { 
       // CLIENT ERROR -- server-side validation failed.
-      this.trigger('client_error', request, status, error);
+      this.trigger('client_error', [request, status, error, this]);
       
       // if data is html, we replace this content of the form with the content
       // of the form that we've just received back
@@ -117,10 +118,10 @@ var methods = {
         throw "Don't know how to handle dataType " + this.settings.dataType;
       }
       
-      this.focus_error();
+      this.invalid();
     } else if (request.status >= 500 && request.status < 600) { 
       // a SERVER ERROR -- something unrecoverable happened on the server
-      this.trigger('server_error', request, status, error);
+      this.trigger('server_error', [request, status, error, this]);
       
       // we aren't going to do anything here.
       // FIXME: we should probably have a way to set this behaviour at the application level.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edifice
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Tom Coleman
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +10:00
+date: 2011-07-20 00:00:00 +10:00
 default_executable: 
 dependencies: []