vendor/assets/javascripts/enlightenment.js in enlightenment-0.0.1.pre.3 vs vendor/assets/javascripts/enlightenment.js in enlightenment-0.0.1.pre.4

@@ -14,12 +14,31 @@
         wrapper      : undefined,
         showErrors   : undefined,
         highlight    : undefined,
         unhighlight  : undefined
       },
-      // messages
 
+      messages : {
+        // remote      : message('invalid'),
+        required    : message('blank'),
+        regex       : message('invalid'),
+        email       : message('invalid'),
+        url         : message('invalid'),
+        date        : message('invalid'),
+        dateISO     : message('invalid'),
+        number      : message('invalid'),
+        digits      : message('invalid'),
+        creditcard  : message('invalid'),
+        equalTo     : message('invalid'),
+        maxlength   : message('invalid'),
+        minlength   : message('invalid'),
+        rangelength : message('invalid'),
+        range       : message('invalid'),
+        max         : message('invalid'),
+        min         : message('invalid')
+      },
+
       prototype : {
         addWrapper : function addWrapper(target) {
           if(this.settings.wrapper) {
             target = target.add(target.closest(this.settings.wrapper));
           }
@@ -33,12 +52,17 @@
   $.enlightenment.extend = function extend(extension) {
     var validator = extension.validator || {};
 
     $.extend(this.validator.settings,  validator.settings  || {});
     $.extend(this.validator.prototype, validator.prototype || {});
+    $.extend(this.validator.messages,  validator.messages  || {});
   };
 
+  $(function() {
+    $.extend($.validator.prototype, $.enlightenment.validator.prototype);
+    $.extend($.validator.messages,  $.enlightenment.validator.messages);
+  });
 
   // extensions to jquery
   // --------------------------------------------------------------------------
   $.fn.extend({
     // like $.fn.clone, but with `id` and `name` corrections.
@@ -83,14 +107,13 @@
 
   // extensions to jquery.validate
   // --------------------------------------------------------------------------
   $.validator.addMethod('regex', function(value, element, regexp) {
       var check = false;
-      var re = new RegExp(regexp.replace('\\A', '^').replace('\\z', '$'));
+      var re = eval(regexp);
       return this.optional(element) || re.test(value);
-    },
-    'You have entered an invalid value for this field'
+    }
   );
 
   $.validator.addMethod('remote', function(value, element, url) {
     if(this.optional(element)) {
       return "dependency-mismatch";
@@ -169,37 +192,9 @@
       }
     });
 
     return "pending";
   });
-
-  $(function() {
-    $.extend($.validator.prototype, $.enlightenment.validator.prototype);
-  });
-
-  // TODO: make non-specific to bootstrap & app-custom label
-  // $.validator.prototype.errorsFor = function(element) {
-  //   return $(element).closest('div.controls').find('label.error');
-  // };
-
-  $.validator.messages = {
-    // remote      : message('invalid'),
-    required    : message('invalid'),
-    email       : message('invalid'),
-    url         : message('invalid'),
-    date        : message('invalid'),
-    dateISO     : message('invalid'),
-    number      : message('invalid'),
-    digits      : message('invalid'),
-    creditcard  : message('invalid'),
-    equalTo     : message('invalid'),
-    maxlength   : message('invalid'),
-    minlength   : message('invalid'),
-    rangelength : message('invalid'),
-    range       : message('invalid'),
-    max         : message('invalid'),
-    min         : message('invalid')
-  };
 
   var pending = {};
 
   function message(key) {
     return function message(parameters, field) {