Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit d48c5b8

Browse files
marosoftmmalerba
authored andcommitted
fix(input): remove unnecessary warnings when ng-messages not provided (#11352)
There is no requirement to include the messages in case of an error. Highlighting the field can be enough. Fixes #10461
1 parent afc2262 commit d48c5b8

File tree

2 files changed

+7
-64
lines changed

2 files changed

+7
-64
lines changed

src/components/input/input-animations.spec.js

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -90,58 +90,6 @@ describe('md-input-container animations', function() {
9090

9191
describe('method tests', function() {
9292

93-
describe('#showInputMessages', function() {
94-
it('logs a warning with no messages element', inject(function($log) {
95-
// Note that the element does NOT have a parent md-input-messages-animation class
96-
var element = angular.element('<div><div class="md-input-message-animation"></div></div>');
97-
var done = jasmine.createSpy('done');
98-
var warnSpy = spyOn($log, 'warn');
99-
100-
$$mdInput.messages.show(element, done);
101-
102-
expect(done).toHaveBeenCalled();
103-
expect(warnSpy).toHaveBeenCalled();
104-
}));
105-
106-
it('logs a warning with no messages children', inject(function($log) {
107-
// Note that the element does NOT have any child md-input-message-animation divs
108-
var element = angular.element('<div class="md-input-messages-animation"></div>');
109-
var done = jasmine.createSpy('done');
110-
var warnSpy = spyOn($log, 'warn');
111-
112-
$$mdInput.messages.show(element, done);
113-
114-
expect(done).toHaveBeenCalled();
115-
expect(warnSpy).toHaveBeenCalled();
116-
}));
117-
});
118-
119-
describe('#hideInputMessages', function() {
120-
it('logs a warning with no messages element', inject(function($log) {
121-
// Note that the element does NOT have a parent md-input-messages-animation class
122-
var element = angular.element('<div><div class="md-input-message-animation"></div></div>');
123-
var done = jasmine.createSpy('done');
124-
var warnSpy = spyOn($log, 'warn');
125-
126-
$$mdInput.messages.hide(element, done);
127-
128-
expect(done).toHaveBeenCalled();
129-
expect(warnSpy).toHaveBeenCalled();
130-
}));
131-
132-
it('logs a warning with no messages children', inject(function($log) {
133-
// Note that the element does NOT have any child md-input-message-animation divs
134-
var element = angular.element('<div class="md-input-messages-animation"></div>');
135-
var done = jasmine.createSpy('done');
136-
var warnSpy = spyOn($log, 'warn');
137-
138-
$$mdInput.messages.hide(element, done);
139-
140-
expect(done).toHaveBeenCalled();
141-
expect(warnSpy).toHaveBeenCalled();
142-
}));
143-
});
144-
14593
describe('#getMessagesElement', function() {
14694

14795
it('finds the messages element itself', function() {

src/components/input/input.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ if (window._mdMocksIncluded) {
2626
return {
2727
// special accessor to internals... useful for testing
2828
messages: {
29-
show : showInputMessages,
30-
hide : hideInputMessages,
3129
getElement : getMessagesElement
3230
}
3331
};
@@ -687,7 +685,7 @@ function mdMaxlengthDirective($animate, $mdUtil) {
687685
attr.$observe('ngTrim', function (value) {
688686
ngTrim = angular.isDefined(value) ? $mdUtil.parseAttributeBoolean(value) : true;
689687
});
690-
688+
691689
scope.$watch(attr.mdMaxlength, function(value) {
692690
if (angular.isNumber(value) && value > 0) {
693691
if (!charCountEl.parent().length) {
@@ -945,10 +943,10 @@ function ngMessageDirective($mdUtil) {
945943
}
946944
}
947945

948-
var $$AnimateRunner, $animateCss, $mdUtil, $log;
946+
var $$AnimateRunner, $animateCss, $mdUtil;
949947

950-
function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil, $log) {
951-
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil, $log);
948+
function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil) {
949+
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil);
952950

953951
return {
954952
addClass: function(element, className, done) {
@@ -959,8 +957,8 @@ function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil,
959957
};
960958
}
961959

962-
function ngMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil, $log) {
963-
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil, $log);
960+
function ngMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil) {
961+
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil);
964962

965963
return {
966964
enter: function(element, done) {
@@ -1013,7 +1011,6 @@ function showInputMessages(element, done) {
10131011
var children = messages.children();
10141012

10151013
if (messages.length == 0 || children.length == 0) {
1016-
$log.warn('mdInput messages show animation called on invalid messages element: ', element);
10171014
done();
10181015
return;
10191016
}
@@ -1033,7 +1030,6 @@ function hideInputMessages(element, done) {
10331030
var children = messages.children();
10341031

10351032
if (messages.length == 0 || children.length == 0) {
1036-
$log.warn('mdInput messages hide animation called on invalid messages element: ', element);
10371033
done();
10381034
return;
10391035
}
@@ -1113,9 +1109,8 @@ function getMessagesElement(element) {
11131109
return angular.element(element[0].querySelector('.md-input-messages-animation'));
11141110
}
11151111

1116-
function saveSharedServices(_$$AnimateRunner_, _$animateCss_, _$mdUtil_, _$log_) {
1112+
function saveSharedServices(_$$AnimateRunner_, _$animateCss_, _$mdUtil_) {
11171113
$$AnimateRunner = _$$AnimateRunner_;
11181114
$animateCss = _$animateCss_;
11191115
$mdUtil = _$mdUtil_;
1120-
$log = _$log_;
11211116
}

0 commit comments

Comments
 (0)