Fix for #5

Rekord · Oct 4, 2016 · 343332f · 343332f
1 parent 3a19283
commit 343332f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "rekord-validation",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "homepage": "https://github.com/Rekord/rekord-validation",
   "authors": [
     "Philip Diffenderfer <[email protected]>"

diff --git a/build/rekord-validation.js b/build/rekord-validation.js
@@ -1,4 +1,4 @@
-/* rekord-validation 1.4.0 - Advanced validation rules for rekord by Philip Diffenderfer */
+/* rekord-validation 1.4.1 - Advanced validation rules for rekord by Philip Diffenderfer */
 (function(global, Rekord, undefined)
 {
   var Model = Rekord.Model;
@@ -1278,9 +1278,11 @@ function subRuleGenerator(ruleName, isInvalid)
         }
       };
 
+      var testValue = otherField === field ? value : model.$get( otherField );
+
       for (var i = 0; i < validators.length; i++)
       {
-        validators[ i ]( value, model, setInvalid );
+        validators[ i ]( testValue, model, setInvalid );
       }
 
       return isInvalid( invalids, validators.length ) ? Validation.Stop : value;

diff --git a/build/rekord-validation.min.js b/build/rekord-validation.min.js
diff --git a/build/rekord-validation.min.js.map b/build/rekord-validation.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rekord-validation",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Advanced validation rules for rekord",
   "author": "Philip Diffenderfer",
   "license": "MIT",

diff --git a/src/lib/rules/if.js b/src/lib/rules/if.js
@@ -81,9 +81,11 @@ function subRuleGenerator(ruleName, isInvalid)
         }
       };
 
+      var testValue = otherField === field ? value : model.$get( otherField );
+
       for (var i = 0; i < validators.length; i++)
       {
-        validators[ i ]( value, model, setInvalid );
+        validators[ i ]( testValue, model, setInvalid );
       }
 
       return isInvalid( invalids, validators.length ) ? Validation.Stop : value;