Merge pull request #54 from diablomarcus/master

Prevents span from being displayed for valid input without messages
hueitan · Nov 20, 2014 · d505d45 · d505d45
2 parents a30e6ed + e6bd4c3
commit d505d45
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/dist/angular-validation-rule.js b/dist/angular-validation-rule.js
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
@@ -277,7 +277,7 @@
 
         });
 }).call(this);
-
+
 (function() {
     angular.module('validation.directive', ['validation.provider'])
         .directive('validator', ['$injector',
@@ -297,10 +297,14 @@
                  * @returns {}
                  */
                 var validFunc = function(element, validMessage, validation, callback, ctrl) {
-                    if ($validationProvider.showSuccessMessage) {
-                        element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                    var messageElem = element.next(),
+                        messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).success;
+
+                    if ($validationProvider.showSuccessMessage && messageToShow) {
+                        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+                        messageElem.css('display', '');
                     } else {
-                        element.next().html('');
+                        messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, true);
                     if (callback) callback();
@@ -319,10 +323,12 @@
                  * @returns {}
                  */
                 var invalidFunc = function(element, validMessage, validation, callback, ctrl) {
+                    var messageElem = element.next();
+                    messageElem.css('display', '');
                     if ($validationProvider.showErrorMessage) {
-                        element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                        messageElem.html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
                     } else {
-                        element.next().html('');
+                        messageElem.html('');
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (callback) callback();
@@ -454,7 +460,7 @@
                         /**
                          * Set initial validity to undefined if no boolean value is transmitted
                          */
-                        var initialValidity = undefined;
+                        var initialValidity;
                         if (typeof scope.initialValidity === 'boolean') {
                             initialValidity = scope.initialValidity;
                         }

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -17,10 +17,14 @@
                  * @returns {}
                  */
                 var validFunc = function(element, validMessage, validation, callback, ctrl) {
-                    if ($validationProvider.showSuccessMessage) {
-                        element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                    var messageElem = element.next(),
+                        messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).success;
+
+                    if ($validationProvider.showSuccessMessage && messageToShow) {
+                        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+                        messageElem.css('display', '');
                     } else {
-                        element.next().html('');
+                        messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, true);
                     if (callback) callback();
@@ -39,10 +43,12 @@
                  * @returns {}
                  */
                 var invalidFunc = function(element, validMessage, validation, callback, ctrl) {
+                    var messageElem = element.next();
+                    messageElem.css('display', '');
                     if ($validationProvider.showErrorMessage) {
-                        element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                        messageElem.html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
                     } else {
-                        element.next().html('');
+                        messageElem.html('');
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (callback) callback();
@@ -174,7 +180,7 @@
                         /**
                          * Set initial validity to undefined if no boolean value is transmitted
                          */
-                        var initialValidity = undefined;
+                        var initialValidity;
                         if (typeof scope.initialValidity === 'boolean') {
                             initialValidity = scope.initialValidity;
                         }