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

Commit

Permalink
fix(input): remove unnecessary warnings when ng-messages not provided (
Browse files Browse the repository at this point in the history
…#11352)

There is no requirement to include the messages in case of an error.
Highlighting the field can be enough.

Fixes #10461
  • Loading branch information
marosoft authored and Splaktar committed Aug 2, 2018
1 parent 036c6bd commit 687d0a8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 64 deletions.
52 changes: 0 additions & 52 deletions src/components/input/input-animations.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,58 +90,6 @@ describe('md-input-container animations', function() {

describe('method tests', function() {

describe('#showInputMessages', function() {
it('logs a warning with no messages element', inject(function($log) {
// Note that the element does NOT have a parent md-input-messages-animation class
var element = angular.element('<div><div class="md-input-message-animation"></div></div>');
var done = jasmine.createSpy('done');
var warnSpy = spyOn($log, 'warn');

$$mdInput.messages.show(element, done);

expect(done).toHaveBeenCalled();
expect(warnSpy).toHaveBeenCalled();
}));

it('logs a warning with no messages children', inject(function($log) {
// Note that the element does NOT have any child md-input-message-animation divs
var element = angular.element('<div class="md-input-messages-animation"></div>');
var done = jasmine.createSpy('done');
var warnSpy = spyOn($log, 'warn');

$$mdInput.messages.show(element, done);

expect(done).toHaveBeenCalled();
expect(warnSpy).toHaveBeenCalled();
}));
});

describe('#hideInputMessages', function() {
it('logs a warning with no messages element', inject(function($log) {
// Note that the element does NOT have a parent md-input-messages-animation class
var element = angular.element('<div><div class="md-input-message-animation"></div></div>');
var done = jasmine.createSpy('done');
var warnSpy = spyOn($log, 'warn');

$$mdInput.messages.hide(element, done);

expect(done).toHaveBeenCalled();
expect(warnSpy).toHaveBeenCalled();
}));

it('logs a warning with no messages children', inject(function($log) {
// Note that the element does NOT have any child md-input-message-animation divs
var element = angular.element('<div class="md-input-messages-animation"></div>');
var done = jasmine.createSpy('done');
var warnSpy = spyOn($log, 'warn');

$$mdInput.messages.hide(element, done);

expect(done).toHaveBeenCalled();
expect(warnSpy).toHaveBeenCalled();
}));
});

describe('#getMessagesElement', function() {

it('finds the messages element itself', function() {
Expand Down
19 changes: 7 additions & 12 deletions src/components/input/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ if (window._mdMocksIncluded) {
return {
// special accessor to internals... useful for testing
messages: {
show : showInputMessages,
hide : hideInputMessages,
getElement : getMessagesElement
}
};
Expand Down Expand Up @@ -687,7 +685,7 @@ function mdMaxlengthDirective($animate, $mdUtil) {
attr.$observe('ngTrim', function (value) {
ngTrim = angular.isDefined(value) ? $mdUtil.parseAttributeBoolean(value) : true;
});

scope.$watch(attr.mdMaxlength, function(value) {
if (angular.isNumber(value) && value > 0) {
if (!charCountEl.parent().length) {
Expand Down Expand Up @@ -945,10 +943,10 @@ function ngMessageDirective($mdUtil) {
}
}

var $$AnimateRunner, $animateCss, $mdUtil, $log;
var $$AnimateRunner, $animateCss, $mdUtil;

function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil, $log) {
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil, $log);
function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil) {
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil);

return {
addClass: function(element, className, done) {
Expand All @@ -959,8 +957,8 @@ function mdInputInvalidMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil,
};
}

function ngMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil, $log) {
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil, $log);
function ngMessagesAnimation($$AnimateRunner, $animateCss, $mdUtil) {
saveSharedServices($$AnimateRunner, $animateCss, $mdUtil);

return {
enter: function(element, done) {
Expand Down Expand Up @@ -1013,7 +1011,6 @@ function showInputMessages(element, done) {
var children = messages.children();

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

if (messages.length == 0 || children.length == 0) {
$log.warn('mdInput messages hide animation called on invalid messages element: ', element);
done();
return;
}
Expand Down Expand Up @@ -1113,9 +1109,8 @@ function getMessagesElement(element) {
return angular.element(element[0].querySelector('.md-input-messages-animation'));
}

function saveSharedServices(_$$AnimateRunner_, _$animateCss_, _$mdUtil_, _$log_) {
function saveSharedServices(_$$AnimateRunner_, _$animateCss_, _$mdUtil_) {
$$AnimateRunner = _$$AnimateRunner_;
$animateCss = _$animateCss_;
$mdUtil = _$mdUtil_;
$log = _$log_;
}

0 comments on commit 687d0a8

Please sign in to comment.