FIX provider.setSuccess/ErrorMessage & no-validation-message

no-validation-message has higher priority than provider set success/error message
hueitan · Nov 26, 2015 · 0946ed4 · 0946ed4
1 parent 440da13
commit 0946ed4
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 5 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -348,7 +348,14 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showSuccessMessage && messageToShow) {
+        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
+      }
 
       ctrl.$setValidity(ctrl.$name, true);
       if (scope.validCallback) scope.validCallback({
@@ -376,8 +383,13 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showErrorMessage && messageToShow) {
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showErrorMessage && messageToShow) {
         messageElem.html($validationProvider.getErrorHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
       }
 
       ctrl.$setValidity(ctrl.$name, false);

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/validator.directive.js b/src/validator.directive.js
@@ -24,7 +24,14 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showSuccessMessage && messageToShow) {
+        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
+      }
 
       ctrl.$setValidity(ctrl.$name, true);
       if (scope.validCallback) scope.validCallback({
@@ -52,8 +59,13 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showErrorMessage && messageToShow) {
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showErrorMessage && messageToShow) {
         messageElem.html($validationProvider.getErrorHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
       }
 
       ctrl.$setValidity(ctrl.$name, false);