From bfe44c7741ac0d297357eb1d7e5de4719aee37c0 Mon Sep 17 00:00:00 2001
From: Adam Becker <ad@mbecker.cc>
Date: Thu, 21 Mar 2013 17:21:38 -0700
Subject: [PATCH] Override value using data-value attribute

---
 dist/parsley-standalone.min.js |  2 +-
 dist/parsley.min.js            |  2 +-
 parsley.js                     | 10 +++++-----
 tests/index.html               |  3 +++
 tests/tests.js                 | 15 +++++++++++++++
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/dist/parsley-standalone.min.js b/dist/parsley-standalone.min.js
index b5621de29..687d7b112 100644
--- a/dist/parsley-standalone.min.js
+++ b/dist/parsley-standalone.min.js
@@ -65,7 +65,7 @@ c},addMessage:function(a,c,b){if("undefined"!==typeof b&&!0===b)this.messages.ty
 typeof c&&this.bindValidationEvents()},updateConstraint:function(a,c){for(var b in a)this.updtConstraint({name:b,requirements:a[b],valid:null},c)},updtConstraint:function(a,c){this.constraints[a.name]=b.extend(!0,this.constraints[a.name],a);"string"===typeof c&&(this.Validator.messages[a.name]=c);this.bindValidationEvents()},removeConstraint:function(a){a=a.toLowerCase();delete this.constraints[a];"required"===a&&(this.isRequired=!1);this.hasConstraints()?this.bindValidationEvents():"ParsleyForm"===
 typeof this.getParent()?this.getParent().removeItem(this.$element):this.destroy()},addCustomConstraintMessage:function(a){var c=a+("type"===a&&"undefined"!==typeof this.options[a]?this.options[a].charAt(0).toUpperCase()+this.options[a].substr(1):"")+"Message";"undefined"!==typeof this.options[c]&&this.Validator.addMessage("type"===a?this.options[a]:a,this.options[c],"type"===a)},bindValidationEvents:function(){this.valid=null;this.$element.addClass("parsley-validated");this.$element.off("."+this.type);
 this.options.remote&&!/change/i.test(this.options.trigger)&&(this.options.trigger=!this.options.trigger?"change":" change");var a=(!this.options.trigger?"":this.options.trigger)+(/key/i.test(this.options.trigger)?"":" keyup");this.$element.is("select")&&(a+=/change/i.test(a)?"":" change");a=a.replace(/^\s+/g,"").replace(/\s+$/g,"");this.$element.on((a+" ").split(" ").join("."+this.type+" "),!1,b.proxy(this.eventValidation,this))},generateHash:function(){return"parsley-"+(Math.random()+"").substring(2)},
-getHash:function(){return this.hash},getVal:function(){return this.$element.val()},eventValidation:function(a){var c=this.getVal();if("keyup"===a.type&&!/keyup/i.test(this.options.trigger)&&!this.validatedOnce||"change"===a.type&&!/change/i.test(this.options.trigger)&&!this.validatedOnce||!this.isRadioOrCheckbox&&c.length<this.options.validationMinlength&&!this.validatedOnce)return!0;this.validate(!0)},isValid:function(){return this.validate(!1)},hasConstraints:function(){for(var a in this.constraints)return!0;
+getHash:function(){return this.hash},getVal:function(){return this.$element.data("value")||this.$element.val()},eventValidation:function(a){var c=this.getVal();if("keyup"===a.type&&!/keyup/i.test(this.options.trigger)&&!this.validatedOnce||"change"===a.type&&!/change/i.test(this.options.trigger)&&!this.validatedOnce||!this.isRadioOrCheckbox&&c.length<this.options.validationMinlength&&!this.validatedOnce)return!0;this.validate(!0)},isValid:function(){return this.validate(!1)},hasConstraints:function(){for(var a in this.constraints)return!0;
 return!1},validate:function(a){var c=this.getVal(),b=null;if(!this.hasConstraints())return null;if(this.options.listeners.onFieldValidate(this.element,this)||""===c&&!this.isRequired)return this.reset(),null;if(!this.needsValidation(c))return this.valid;this.errorBubbling="undefined"!==typeof a?a:!0;b=this.applyValidators();this.errorBubbling&&this.manageValidationResult();return b},needsValidation:function(a){if(!this.options.validateIfUnchanged&&null!==this.valid&&this.val===a&&this.validatedOnce)return!1;
 this.val=a;return this.validatedOnce=!0},applyValidators:function(){var a=null,c;for(c in this.constraints){var b=this.Validator.validators[this.constraints[c].name](this.val,this.constraints[c].requirements,this);!1===b?(a=!1,this.constraints[c].valid=a):!0===b&&(this.constraints[c].valid=!0,a=!1!==a)}return a},manageValidationResult:function(){var a=null,b;for(b in this.constraints)!1===this.constraints[b].valid?(this.manageError(this.constraints[b]),a=!1):!0===this.constraints[b].valid&&(this.removeError(this.constraints[b].name),
 a=!1!==a);this.valid=a;return!0===this.valid?(this.removeErrors(),this.errorClassHandler.removeClass(this.options.errorClass).addClass(this.options.successClass),this.options.listeners.onFieldSuccess(this.element,this.constraints,this),!0):!1===this.valid?(this.errorClassHandler.removeClass(this.options.successClass).addClass(this.options.errorClass),this.options.listeners.onFieldError(this.element,this.constraints,this),!1):a},ulErrorManagement:function(){this.ulError="#"+this.hash;this.ulTemplate=
diff --git a/dist/parsley.min.js b/dist/parsley.min.js
index 6e961e574..b1aabd4d1 100644
--- a/dist/parsley.min.js
+++ b/dist/parsley.min.js
@@ -15,7 +15,7 @@ b},addMessage:function(a,b,c){if("undefined"!==typeof c&&!0===c)this.messages.ty
 typeof b&&this.bindValidationEvents()},updateConstraint:function(a,b){for(var c in a)this.updtConstraint({name:c,requirements:a[c],valid:null},b)},updtConstraint:function(a,b){this.constraints[a.name]=d.extend(!0,this.constraints[a.name],a);"string"===typeof b&&(this.Validator.messages[a.name]=b);this.bindValidationEvents()},removeConstraint:function(a){a=a.toLowerCase();delete this.constraints[a];"required"===a&&(this.isRequired=!1);this.hasConstraints()?this.bindValidationEvents():"ParsleyForm"===
 typeof this.getParent()?this.getParent().removeItem(this.$element):this.destroy()},addCustomConstraintMessage:function(a){var b=a+("type"===a&&"undefined"!==typeof this.options[a]?this.options[a].charAt(0).toUpperCase()+this.options[a].substr(1):"")+"Message";"undefined"!==typeof this.options[b]&&this.Validator.addMessage("type"===a?this.options[a]:a,this.options[b],"type"===a)},bindValidationEvents:function(){this.valid=null;this.$element.addClass("parsley-validated");this.$element.off("."+this.type);
 this.options.remote&&!/change/i.test(this.options.trigger)&&(this.options.trigger=!this.options.trigger?"change":" change");var a=(!this.options.trigger?"":this.options.trigger)+(/key/i.test(this.options.trigger)?"":" keyup");this.$element.is("select")&&(a+=/change/i.test(a)?"":" change");a=a.replace(/^\s+/g,"").replace(/\s+$/g,"");this.$element.on((a+" ").split(" ").join("."+this.type+" "),!1,d.proxy(this.eventValidation,this))},generateHash:function(){return"parsley-"+(Math.random()+"").substring(2)},
-getHash:function(){return this.hash},getVal:function(){return this.$element.val()},eventValidation:function(a){var b=this.getVal();if("keyup"===a.type&&!/keyup/i.test(this.options.trigger)&&!this.validatedOnce||"change"===a.type&&!/change/i.test(this.options.trigger)&&!this.validatedOnce||!this.isRadioOrCheckbox&&b.length<this.options.validationMinlength&&!this.validatedOnce)return!0;this.validate(!0)},isValid:function(){return this.validate(!1)},hasConstraints:function(){for(var a in this.constraints)return!0;
+getHash:function(){return this.hash},getVal:function(){return this.$element.data("value")||this.$element.val()},eventValidation:function(a){var b=this.getVal();if("keyup"===a.type&&!/keyup/i.test(this.options.trigger)&&!this.validatedOnce||"change"===a.type&&!/change/i.test(this.options.trigger)&&!this.validatedOnce||!this.isRadioOrCheckbox&&b.length<this.options.validationMinlength&&!this.validatedOnce)return!0;this.validate(!0)},isValid:function(){return this.validate(!1)},hasConstraints:function(){for(var a in this.constraints)return!0;
 return!1},validate:function(a){var b=this.getVal(),c=null;if(!this.hasConstraints())return null;if(this.options.listeners.onFieldValidate(this.element,this)||""===b&&!this.isRequired)return this.reset(),null;if(!this.needsValidation(b))return this.valid;this.errorBubbling="undefined"!==typeof a?a:!0;c=this.applyValidators();this.errorBubbling&&this.manageValidationResult();return c},needsValidation:function(a){if(!this.options.validateIfUnchanged&&null!==this.valid&&this.val===a&&this.validatedOnce)return!1;
 this.val=a;return this.validatedOnce=!0},applyValidators:function(){var a=null,b;for(b in this.constraints){var c=this.Validator.validators[this.constraints[b].name](this.val,this.constraints[b].requirements,this);!1===c?(a=!1,this.constraints[b].valid=a):!0===c&&(this.constraints[b].valid=!0,a=!1!==a)}return a},manageValidationResult:function(){var a=null,b;for(b in this.constraints)!1===this.constraints[b].valid?(this.manageError(this.constraints[b]),a=!1):!0===this.constraints[b].valid&&(this.removeError(this.constraints[b].name),
 a=!1!==a);this.valid=a;return!0===this.valid?(this.removeErrors(),this.errorClassHandler.removeClass(this.options.errorClass).addClass(this.options.successClass),this.options.listeners.onFieldSuccess(this.element,this.constraints,this),!0):!1===this.valid?(this.errorClassHandler.removeClass(this.options.successClass).addClass(this.options.errorClass),this.options.listeners.onFieldError(this.element,this.constraints,this),!1):a},ulErrorManagement:function(){this.ulError="#"+this.hash;this.ulTemplate=
diff --git a/parsley.js b/parsley.js
index e547da05d..6f36e2ce3 100644
--- a/parsley.js
+++ b/parsley.js
@@ -18,7 +18,7 @@
   var Validator = function ( options ) {
     /**
     * Error messages
-    * 
+    *
     * @property messages
     * @type {Object}
     */
@@ -59,7 +59,7 @@
 
     /**
     * Validator list. Built-in validators functions
-    * 
+    *
     * @property validators
     * @type {Object}
     */
@@ -601,7 +601,7 @@
     * @returns {String} val
     */
     , getVal: function () {
-      return this.$element.val();
+      return this.$element.data('value') || this.$element.val();
     }
 
     /**
@@ -1196,7 +1196,7 @@
 
       this.$element.off( '.' + this.type ).removeData( this.type );
     }
-    
+
     /**
     * reset Parsley binded on the form and its fields
     *
@@ -1272,7 +1272,7 @@
 
   /**
   * Parsley plugin configuration
-  * 
+  *
   * @property $.fn.parsley.defaults
   * @type {Object}
   */
diff --git a/tests/index.html b/tests/index.html
index 78572aa68..56cb4fdf7 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -127,6 +127,9 @@
             <input type="text" id="remote1" name="remote1" data-remote="http://foo.bar" data-remote-datatype="jsonp" />
             <input type="text" id="remote2" name="remote2" data-remote="http://foo.bar/baz" data-trigger="change" data-remote-method="POST" />
 
+            <input type="text" id="datavalue1" name="datavalue1" data-value="" value="" data-required="true" />
+            <input type="text" id="datavalue2" name="datavalue2" data-value="foo" value="" data-required="true" />
+
             <input type="submit" />
         </form>
         <form id="validate-form" data-validate="parsley">
diff --git a/tests/tests.js b/tests/tests.js
index d855a1adb..e4b26bc30 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -563,6 +563,21 @@ var testSuite = function () {
       } )
     } )
 
+    /***************************************
+         override value with data-value
+    ***************************************/
+    describe ( 'Override value with data-value' , function () {
+      it ( 'required - data-value is empty, value is empty', function () {
+        triggerSubmitValidation( '#datavalue1', '' );
+        expect( $( '#datavalue1' ).hasClass( 'parsley-error' ) ).to.be( true );
+        expect( getErrorMessage( '#datavalue1', 'required') ).to.be( 'This value is required.' );
+      } )
+      it ( 'required - data-value has value, value is empty', function () {
+        triggerSubmitValidation( '#datavalue2', '' );
+        expect( $( '#datavalue2' ).hasClass( 'parsley-success' ) ).to.be( true );
+      } )
+    } )
+
     /***************************************
           test options changes
     ***************************************/