Merge pull request #57 from diablomarcus/master

Allows global disabling of error messages in case someone wants that
hueitan · Dec 5, 2014 · 8b1b46f · 8b1b46f
2 parents ff1aee1 + 18464b7
commit 8b1b46f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -323,12 +323,14 @@
                  * @returns {}
                  */
                 var invalidFunc = function(element, validMessage, validation, callback, ctrl) {
-                    var messageElem = element.next();
-                    messageElem.css('display', '');
-                    if ($validationProvider.showErrorMessage) {
-                        messageElem.html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                    var messageElem = element.next(),
+                        messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).error;
+
+                    if ($validationProvider.showErrorMessage && messageToShow) {
+                        messageElem.html($validationProvider.getErrorHTML(messageToShow));
+                        messageElem.css('display', '');
                     } else {
-                        messageElem.html('');
+                        messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (callback) callback();

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -43,12 +43,14 @@
                  * @returns {}
                  */
                 var invalidFunc = function(element, validMessage, validation, callback, ctrl) {
-                    var messageElem = element.next();
-                    messageElem.css('display', '');
-                    if ($validationProvider.showErrorMessage) {
-                        messageElem.html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                    var messageElem = element.next(),
+                        messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).error;
+
+                    if ($validationProvider.showErrorMessage && messageToShow) {
+                        messageElem.html($validationProvider.getErrorHTML(messageToShow));
+                        messageElem.css('display', '');
                     } else {
-                        messageElem.html('');
+                        messageElem.css('display', 'none');
                     }
                     ctrl.$setValidity(ctrl.$name, false);
                     if (callback) callback();