Allow disable showing success message #6

hueitan · Apr 11, 2014 · 09894d8 · 09894d8
1 parent 5b207ad
commit 09894d8
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 5 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -145,6 +145,24 @@
             };
 
 
+            /**
+             * Whether show the validation success message
+             * You can easily change this to false in your config
+             * example: $validationProvider.showSuccessMessage = false;
+             * @type {boolean}
+             */
+            this.showSuccessMessage = true;
+
+
+            /**
+             * Whether show the validation error message
+             * You can easily change this to false in your config
+             * example: $validationProvider.showErrorMessage = false;
+             * @type {boolean}
+             */
+            this.showErrorMessage = true;
+
+
             /**
              * Check form valid, return true
              * checkValid(Form): Check the specific form(Form) valid from angular `$valid`
@@ -230,6 +248,8 @@
                     getExpression: this.getExpression,
                     setDefaultMsg: this.setDefaultMsg,
                     getDefaultMsg: this.getDefaultMsg,
+                    showSuccessMessage: this.showSuccessMessage,
+                    showErrorMessage: this.showErrorMessage,
                     checkValid: this.checkValid,
                     validate: this.validate,
                     reset: this.reset
@@ -257,7 +277,11 @@
              * @returns {}
              */
             var validFunc = function (element, validMessage, validation, callback, ctrl) {
-                element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                if ($validationProvider.showSuccessMessage) {
+                    element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                } else {
+                    element.next().html('');
+                }
                 ctrl.$setValidity(ctrl.$name, true);
                 if (callback) callback();
             };
@@ -273,7 +297,11 @@
              * @returns {}
              */
             var invalidFunc = function (element, validMessage, validation, callback, ctrl) {
-                element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                if ($validationProvider.showErrorMessage) {
+                    element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                } else {
+                    element.next().html('');
+                }
                 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
@@ -16,7 +16,11 @@
              * @returns {}
              */
             var validFunc = function (element, validMessage, validation, callback, ctrl) {
-                element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                if ($validationProvider.showSuccessMessage) {
+                    element.next().html($validationProvider.getSuccessHTML(validMessage || $validationProvider.getDefaultMsg(validation).success));
+                } else {
+                    element.next().html('');
+                }
                 ctrl.$setValidity(ctrl.$name, true);
                 if (callback) callback();
             };
@@ -32,7 +36,11 @@
              * @returns {}
              */
             var invalidFunc = function (element, validMessage, validation, callback, ctrl) {
-                element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                if ($validationProvider.showErrorMessage) {
+                    element.next().html($validationProvider.getErrorHTML(validMessage || $validationProvider.getDefaultMsg(validation).error));
+                } else {
+                    element.next().html('');
+                }
                 ctrl.$setValidity(ctrl.$name, false);
                 if (callback) callback();
             };

diff --git a/src/provider.js b/src/provider.js
@@ -142,6 +142,24 @@
             };
 
 
+            /**
+             * Whether show the validation success message
+             * You can easily change this to false in your config
+             * example: $validationProvider.showSuccessMessage = false;
+             * @type {boolean}
+             */
+            this.showSuccessMessage = true;
+
+
+            /**
+             * Whether show the validation error message
+             * You can easily change this to false in your config
+             * example: $validationProvider.showErrorMessage = false;
+             * @type {boolean}
+             */
+            this.showErrorMessage = true;
+
+
             /**
              * Check form valid, return true
              * checkValid(Form): Check the specific form(Form) valid from angular `$valid`
@@ -227,6 +245,8 @@
                     getExpression: this.getExpression,
                     setDefaultMsg: this.setDefaultMsg,
                     getDefaultMsg: this.getDefaultMsg,
+                    showSuccessMessage: this.showSuccessMessage,
+                    showErrorMessage: this.showErrorMessage,
                     checkValid: this.checkValid,
                     validate: this.validate,
                     reset: this.reset