Skip to content

Commit 0946ed4

Browse files
committed
FIX provider.setSuccess/ErrorMessage & no-validation-message
no-validation-message has higher priority than provider set success/error message
1 parent 440da13 commit 0946ed4

File tree

4 files changed

+157
-5
lines changed

4 files changed

+157
-5
lines changed

dist/angular-validation.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,14 @@
348348
if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
349349
else messageElem = element.next();
350350

351-
if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
351+
if (element.attr('no-validation-message')) {
352+
messageElem.css('display', 'none');
353+
} else if ($validationProvider.showSuccessMessage && messageToShow) {
354+
messageElem.html($validationProvider.getSuccessHTML(messageToShow));
355+
messageElem.css('display', '');
356+
} else {
357+
messageElem.css('display', 'none');
358+
}
352359

353360
ctrl.$setValidity(ctrl.$name, true);
354361
if (scope.validCallback) scope.validCallback({
@@ -376,8 +383,13 @@
376383
if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
377384
else messageElem = element.next();
378385

379-
if ($validationProvider.showErrorMessage && messageToShow) {
386+
if (element.attr('no-validation-message')) {
387+
messageElem.css('display', 'none');
388+
} else if ($validationProvider.showErrorMessage && messageToShow) {
380389
messageElem.html($validationProvider.getErrorHTML(messageToShow));
390+
messageElem.css('display', '');
391+
} else {
392+
messageElem.css('display', 'none');
381393
}
382394

383395
ctrl.$setValidity(ctrl.$name, false);

dist/angular-validation.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/validator.directive.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@
2424
if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
2525
else messageElem = element.next();
2626

27-
if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
27+
if (element.attr('no-validation-message')) {
28+
messageElem.css('display', 'none');
29+
} else if ($validationProvider.showSuccessMessage && messageToShow) {
30+
messageElem.html($validationProvider.getSuccessHTML(messageToShow));
31+
messageElem.css('display', '');
32+
} else {
33+
messageElem.css('display', 'none');
34+
}
2835

2936
ctrl.$setValidity(ctrl.$name, true);
3037
if (scope.validCallback) scope.validCallback({
@@ -52,8 +59,13 @@
5259
if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
5360
else messageElem = element.next();
5461

55-
if ($validationProvider.showErrorMessage && messageToShow) {
62+
if (element.attr('no-validation-message')) {
63+
messageElem.css('display', 'none');
64+
} else if ($validationProvider.showErrorMessage && messageToShow) {
5665
messageElem.html($validationProvider.getErrorHTML(messageToShow));
66+
messageElem.css('display', '');
67+
} else {
68+
messageElem.css('display', 'none');
5769
}
5870

5971
ctrl.$setValidity(ctrl.$name, false);

0 commit comments

Comments
 (0)