hueitan
diff --git a/‎Gruntfile.js
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎Gruntfile.js
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎config/karma.conf.angular.1.3.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎config/karma.conf.angular.1.3.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/angular-validation-rule.js
Copy file name to clipboard
100755100644 b/‎dist/angular-validation-rule.js
Copy file name to clipboard
100755100644
diff --git a/‎dist/angular-validation-rule.min.js
Copy file name to clipboard
100755100644 b/‎dist/angular-validation-rule.min.js
Copy file name to clipboard
100755100644
diff --git a/‎dist/angular-validation.js
Copy file name to clipboard
100755100644
+45-19Lines changed: 45 additions & 19 deletions b/‎dist/angular-validation.js
Copy file name to clipboard
100755100644
+45-19Lines changed: 45 additions & 19 deletions
@@ -95,5 +95,6 @@ module.exports = function(grunt) {
     grunt.registerTask('dev', ['browserSync', 'watch']);
     grunt.registerTask('build', ['clean', 'concat', 'uglify']);
     grunt.registerTask('check', ['jshint', 'jsbeautifier', 'build']); // use this before commit
+    grunt.registerTask('test', ['karma']);
 
 };
@@ -75,4 +75,4 @@ module.exports = function(config) {
             'karma-phantomjs-launcher'
         ]
     });
-};
+};
@@ -153,7 +153,6 @@
              */
             this.showErrorMessage = true;
 
-
             /**
              * Check form valid, return true
              * checkValid(Form): Check the specific form(Form) valid from angular `$valid`
@@ -277,7 +276,7 @@
 
         });
 }).call(this);
-
+
 (function() {
     angular.module('validation.directive', ['validation.provider'])
         .directive('validator', ['$injector',
@@ -296,18 +295,23 @@
                  * @param ctrl
                  * @returns {}
                  */
-                var validFunc = function(element, validMessage, validation, callback, ctrl) {
-                    var messageElem = element.next(),
+                var validFunc = function(element, validMessage, validation, scope, ctrl) {
+                    var messageElem,
                         messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).success;
 
+                    if (scope.messageId)
+                        messageElem = angular.element(document.querySelector('#' + scope.messageId));
+                    else
+                        messageElem = element.next();
+
                     if ($validationProvider.showSuccessMessage && messageToShow) {
                         messageElem.html($validationProvider.getSuccessHTML(messageToShow));
                         messageElem.css('display', '');
                     } else {
                         messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, true);
-                    if (callback) callback();
+                    if (scope.validCallback) scope.validCallback();
 
                     return true;
                 };
@@ -322,18 +326,23 @@
                  * @param ctrl
                  * @returns {}
                  */
-                var invalidFunc = function(element, validMessage, validation, callback, ctrl) {
-                    var messageElem = element.next(),
+                var invalidFunc = function(element, validMessage, validation, scope, ctrl) {
+                    var messageElem,
                         messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).error;
 
+                    if (scope.messageId)
+                        messageElem = angular.element(document.querySelector('#' + scope.messageId));
+                    else
+                        messageElem = element.next();
+
                     if ($validationProvider.showErrorMessage && messageToShow) {
                         messageElem.html($validationProvider.getErrorHTML(messageToShow));
                         messageElem.css('display', '');
                     } else {
                         messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, false);
-                    if (callback) callback();
+                    if (scope.inValidCallback) scope.inValidCallback();
 
                     return false;
                 };
@@ -367,15 +376,15 @@
                         expression = $validationProvider.getExpression(validator),
                         valid = {
                             success: function() {
-                                validFunc(element, attrs[successMessage], validator, scope.validCallback, ctrl);
+                                validFunc(element, attrs[successMessage], validator, scope, ctrl);
                                 if (leftValidation.length) {
                                     checkValidation(scope, element, attrs, ctrl, leftValidation, value);
                                 } else {
                                     return true;
                                 }
                             },
                             error: function() {
-                                return invalidFunc(element, attrs[errorMessage], validator, scope.invalidCallback, ctrl);
+                                return invalidFunc(element, attrs[errorMessage], validator, scope, ctrl);
                             }
                         };
 
@@ -402,7 +411,11 @@
                     }
                     // Check with RegExp
                     else if (expression.constructor === RegExp) {
-                        return $validationProvider.getExpression(validator).test(value) ? valid.success() : valid.error();
+                        // Only apply the test if the value is neither undefined or null
+                        if (value !== undefined && value !== null)
+                            return $validationProvider.getExpression(validator).test(value) ? valid.success() : valid.error();
+                        else
+                            return valid.error();
                     } else {
                         return valid.error();
                     }
@@ -427,7 +440,8 @@
                         model: '=ngModel',
                         initialValidity: '=initialValidity',
                         validCallback: '&',
-                        invalidCallback: '&'
+                        invalidCallback: '&',
+                        messageId: '@'
                     },
                     link: function(scope, element, attrs, ctrl) {
 
@@ -454,10 +468,6 @@
                          */
                         var uid = ctrl.validationId = guid();
 
-                        /**
-                         * Valid/Invalid Message
-                         */
-                        element.after('<span></span>');
 
                         /**
                          * Set initial validity to undefined if no boolean value is transmitted
@@ -467,6 +477,12 @@
                             initialValidity = scope.initialValidity;
                         }
 
+                        /**
+                         * Default Valid/Invalid Message
+                         */
+                        if (!scope.messageId)
+                            element.after('<span></span>');
+
                         /**
                          * Set custom initial validity
                          * Usage: <input initial-validity="true" ... >
@@ -491,7 +507,10 @@
                             ctrl.$setPristine();
                             ctrl.$setValidity(ctrl.$name, undefined);
                             ctrl.$render();
-                            element.next().html('');
+                            if (scope.messageId)
+                                angular.element(document.querySelector('#' + scope.messageId)).html('');
+                            else
+                                element.next().html('');
                         });
 
                         /**
@@ -574,7 +593,10 @@
                                     ctrl.$setViewValue(ctrl.$viewValue);
                                 } else if (ctrl.$pristine) {
                                     // Don't validate form when the input is clean(pristine)
-                                    element.next().html('');
+                                    if (scope.messageId)
+                                        angular.element(document.querySelector('#' + scope.messageId)).html('');
+                                    else
+                                        element.next().html('');
                                     return;
                                 }
                                 checkValidation(scope, element, attrs, ctrl, validation, value);
@@ -587,7 +609,11 @@
                              * Don't showup the validation Message
                              */
                             attrs.$observe('noValidationMessage', function(value) {
-                                var el = element.next();
+                                var el;
+                                if (scope.messageId)
+                                    el = angular.element(document.querySelector('#' + scope.messageId));
+                                else
+                                    el = element.next();
                                 if (value == 'true' || value === true) {
                                     el.css('display', 'none');
                                 } else if (value == 'false' || value === false) {
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,4 @@ module.exports = function(config) {`
`75`	`75`	`'karma-phantomjs-launcher'`
`76`	`76`	`]`
`77`	`77`	`});`
`78`		`-};`
	`78`	`+};`