Do more in setExpression(...) #17 thanks @tammasr

hueitan · May 31, 2014 · b1f875e · b1f875e
1 parent a58a1c4
commit b1f875e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -158,12 +158,7 @@ angular.module('yourApp', ['validation'])
 
         // Setup `huei` validation
         validationProvider.setExpression({
-
-            /**
-            * @param value , user input
-            * @returns {boolean} true iff valid
-            */
-            huei: function (value) {
+            huei: function (value, scope, element, attrs) {
                 return value === 'Huei Tan';
                 // or you can do
                 return $q.all([obj]).then(function () {

diff --git a/demo/demo.js b/demo/demo.js
@@ -48,11 +48,7 @@
              * Additions validation
              */
             $validationProvider.setExpression({
-                /**
-                 * @param value , user input
-                 * @returns {boolean} true iff valid
-                 */
-                huei: function (value) {
+                huei: function (value, scope, element, attrs) {
                     return value === 'Huei Tan';
                 }
             });
@@ -63,6 +59,24 @@
                     success: 'Thanks!'
                 }
             });
+
+            /**
+             * Range Validation
+             */
+            $validationProvider.setExpression({
+                range: function (value, scope, element, attrs) {
+                    if (value >= parseInt(attrs.min) && value <= parseInt(attrs.max)) {
+                        return value;
+                    }
+                }
+            });
+
+            $validationProvider.setDefaultMsg({
+                range: {
+                    error: 'Number should between 5 ~ 10',
+                    success: 'good'
+                }
+            });
         }])
 
         // -------------------

diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -346,7 +346,7 @@
 
                 // Check with Function
                 if (expressionType === Function) {
-                    return $q.all([$validationProvider.getExpression(validation)(value)])
+                    return $q.all([$validationProvider.getExpression(validation)(value, scope, element, attrs)])
                         .then(function (data) {
                             if (data && data.length > 0 && data[0]) {
                                 return valid.success();

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/index.html b/index.html
@@ -173,6 +173,11 @@ <h1>Angular Validation.
                     </div>
                 </div>
 
+                <div class="row collapse">
+                    <div class="small-12 columns">
+                        <input type="text" validator="range" name="range" ng-model="form4.range" placeholder="number 5~10" min="5" max="10">
+                    </div>
+                </div>
             </fieldset>
         </form>
     </div>

diff --git a/src/directive.js b/src/directive.js
@@ -83,7 +83,7 @@
 
                 // Check with Function
                 if (expressionType === Function) {
-                    return $q.all([$validationProvider.getExpression(validation)(value)])
+                    return $q.all([$validationProvider.getExpression(validation)(value, scope, element, attrs)])
                         .then(function (data) {
                             if (data && data.length > 0 && data[0]) {
                                 return valid.success();