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

fix(ngMessage): make ngMessage work with ngBind #13074

Merged
merged 1 commit into from
Nov 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ngMessages/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ angular.module('ngMessages', [])
* @ngdoc directive
* @name ngMessageExp
* @restrict AE
* @priority 1
* @scope
*
* @description
Expand Down Expand Up @@ -604,6 +605,7 @@ function ngMessageDirectiveFactory() {
return {
restrict: 'AE',
transclude: 'element',
priority: 1, // must run before ngBind, otherwise the text is set on the comment
terminal: true,
require: '^^ngMessages',
link: function(scope, element, attrs, ngMessagesCtrl, $transclude) {
Expand Down
40 changes: 40 additions & 0 deletions test/ngMessages/messagesSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,46 @@ describe('ngMessages', function() {
expect(trim(element.text())).toEqual("Enter something");
}));


it('should be compatible with ngBind',
inject(function($rootScope, $compile) {

element = $compile('<div ng-messages="col">' +
' <div ng-message="required" ng-bind="errorMessages.required"></div>' +
' <div ng-message="extra" ng-bind="errorMessages.extra"></div>' +
'</div>')($rootScope);

$rootScope.$apply(function() {
$rootScope.col = {
required: true,
extra: true
};
$rootScope.errorMessages = {
required: 'Fill in the text field.',
extra: 'Extra error message.'
};
});

expect(messageChildren(element).length).toBe(1);
expect(trim(element.text())).toEqual('Fill in the text field.');

$rootScope.$apply(function() {
$rootScope.col.required = false;
$rootScope.col.extra = true;
});

expect(messageChildren(element).length).toBe(1);
expect(trim(element.text())).toEqual('Extra error message.');

$rootScope.$apply(function() {
$rootScope.errorMessages.extra = 'New error message.';
});

expect(messageChildren(element).length).toBe(1);
expect(trim(element.text())).toEqual('New error message.');
}));


// issue #12856
it('should only detach the message object that is associated with the message node being removed',
inject(function($rootScope, $compile, $animate) {
Expand Down