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

Fix ngClass mixed array/object when object instance does not changes #14405

Closed
wants to merge 3 commits into from
Closed

Fix ngClass mixed array/object when object instance does not changes #14405

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd97464
test(ngClass): add the case mixed array/object variable with a mutati…
drpicox Apr 9, 2016
e54492c
fix(ngClass): fix shallowCopy of mixed array and object
drpicox Apr 9, 2016
3b91bb1
fix(ngClass): improve code of mutating object test case
drpicox Apr 10, 2016
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
6 changes: 5 additions & 1 deletion src/ng/directive/ngClass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ function classDirective(name, selector) {
updateClasses(oldClasses, newClasses);
}
}
oldVal = shallowCopy(newVal);
if (isArray(newVal)) {
oldVal = newVal.map(function(v) { return shallowCopy(v); });
} else {
oldVal = shallowCopy(newVal);
}
}
}
};
Expand Down
12 changes: 12 additions & 0 deletions test/ng/directive/ngClassSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,18 @@ describe('ngClass', function() {
expect(e2.hasClass('even')).toBeTruthy();
expect(e2.hasClass('odd')).toBeFalsy();
}));

it('should support changing multiple classes via variable array mixed with conditionally via a map', inject(function($rootScope, $compile) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pleasd wrap lines at 100 chars.

$rootScope.classVar = ['', {orange: true}];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the '' necessary ?

element = $compile('<div class="existing" ng-class="classVar"></div>')($rootScope);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the class="existing" part. It's better to keep the test code as simple as possible.

$rootScope.$digest();

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add an expectation to make sure orange is present (just in case 😃).

$rootScope.classVar[1].orange = false;
$rootScope.$digest();

expect(element.hasClass('orange')).toBeFalsy();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the toHaveClass() custom matcher.

}));

});

describe('ngClass animations', function() {
Expand Down