Allow passing of a parameter to validation rule and added min and max…

… length rules
hueitan · Mar 18, 2015 · dffdc32 · dffdc32
1 parent d1e866d
commit dffdc32
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 8 deletions.
diff --git a/dist/angular-validation-rule.js b/dist/angular-validation-rule.js
@@ -9,7 +9,13 @@
                     },
                     url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
                     email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
-                    number: /^\d+$/
+                    number: /^\d+$/,
+                    minlength: function(value, scope, element, attrs, param) {
+                        return value.length >= param;
+                    },
+                    maxlength: function(value, scope, element, attrs, param) {
+                        return value.length <= param;
+                    }
                 };
 
                 var defaultMsg = {
@@ -28,6 +34,14 @@
                     number: {
                         error: 'This should be Number',
                         success: 'It\'s Number'
+                    },
+                    minlength: {
+                        error: 'This should be longer',
+                        success: 'Long enough!'
+                    },
+                    maxlength: {
+                        error: 'This should be shorter',
+                        success: 'Short enough!'
                     }
                 };
 

diff --git a/dist/angular-validation-rule.min.js b/dist/angular-validation-rule.min.js
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -384,7 +384,10 @@
                 var checkValidation = function(scope, element, attrs, ctrl, validation, value) {
 
                     var validators = validation.slice(0),
-                        validator = validators[0].trim(),
+                        validatorExpr = validators[0].trim(),
+                        paramIndex = validatorExpr.indexOf('='),
+                        validator = paramIndex === -1 ? validatorExpr : validatorExpr.substr(0, paramIndex),
+                        validatorParam = paramIndex === -1 ? null : validatorExpr.substr(paramIndex + 1),
                         leftValidation = validators.slice(1),
                         successMessage = validator + 'SuccessMessage',
                         errorMessage = validator + 'ErrorMessage',
@@ -413,7 +416,7 @@
                     }
                     // Check with Function
                     if (expression.constructor === Function) {
-                        return $q.all([$validationProvider.getExpression(validator)(value, scope, element, attrs)])
+                        return $q.all([$validationProvider.getExpression(validator)(value, scope, element, attrs, validatorParam)])
                             .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/src/directive.js b/src/directive.js
@@ -92,7 +92,10 @@
                 var checkValidation = function(scope, element, attrs, ctrl, validation, value) {
 
                     var validators = validation.slice(0),
-                        validator = validators[0].trim(),
+                        validatorExpr = validators[0].trim(),
+                        paramIndex = validatorExpr.indexOf('='),
+                        validator = paramIndex === -1 ? validatorExpr : validatorExpr.substr(0, paramIndex),
+                        validatorParam = paramIndex === -1 ? null : validatorExpr.substr(paramIndex + 1),
                         leftValidation = validators.slice(1),
                         successMessage = validator + 'SuccessMessage',
                         errorMessage = validator + 'ErrorMessage',
@@ -121,7 +124,7 @@
                     }
                     // Check with Function
                     if (expression.constructor === Function) {
-                        return $q.all([$validationProvider.getExpression(validator)(value, scope, element, attrs)])
+                        return $q.all([$validationProvider.getExpression(validator)(value, scope, element, attrs, validatorParam)])
                             .then(function(data) {
                                 if (data && data.length > 0 && data[0]) {
                                     return valid.success();

diff --git a/src/rule.js b/src/rule.js
@@ -9,7 +9,13 @@
                     },
                     url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
                     email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
-                    number: /^\d+$/
+                    number: /^\d+$/,
+                    minlength: function(value, scope, element, attrs, param) {
+                        return value.length >= param;
+                    },
+                    maxlength: function(value, scope, element, attrs, param) {
+                        return value.length <= param;
+                    }
                 };
 
                 var defaultMsg = {
@@ -28,6 +34,14 @@
                     number: {
                         error: 'This should be Number',
                         success: 'It\'s Number'
+                    },
+                    minlength: {
+                        error: 'This should be longer',
+                        success: 'Long enough!'
+                    },
+                    maxlength: {
+                        error: 'This should be shorter',
+                        success: 'Short enough!'
                     }
                 };