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

fix(ngClass): remove classes already on the dom #9811

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
16 changes: 16 additions & 0 deletions src/ng/directive/ngClass.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,26 @@ function classDirective(name, selector) {
}
}

function removeFalseClasses(classVal) {
if (isArray(classVal) || isString(classVal)) {
return;
}
if (isObject(classVal)) {
var classes = [], i = 0;
forEach(classVal, function(v, k) {
if (!v) {
classes = classes.concat(k.split(' '));
}
});
attr.$removeClass(classes);
}
}

function ngClassWatchAction(newVal) {
if (selector === true || scope.$index % 2 === selector) {
var newClasses = arrayClasses(newVal || []);
if (!oldVal) {
removeFalseClasses(newVal);
addClasses(newClasses);
} else if (!equals(newVal,oldVal)) {
var oldClasses = arrayClasses(oldVal);
Expand Down
8 changes: 6 additions & 2 deletions test/ng/directive/ngClassSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,26 @@ describe('ngClass', function() {
it('should support adding multiple classes conditionally via a map of class names to boolean ' +
'expressions', inject(function($rootScope, $compile) {
element = $compile(
'<div class="existing" ' +
'ng-class="{A: conditionA, B: conditionB(), AnotB: conditionA&&!conditionB()}">' +
'<div class="existing existingTrue existingFalse" ' +
'ng-class="{A: conditionA, B: conditionB(), AnotB: conditionA&&!conditionB(), existingTrue: true, existingFalse: false}">' +
'</div>')($rootScope);
$rootScope.conditionA = true;
$rootScope.$digest();
expect(element.hasClass('existing')).toBeTruthy();
expect(element.hasClass('A')).toBeTruthy();
expect(element.hasClass('B')).toBeFalsy();
expect(element.hasClass('AnotB')).toBeTruthy();
expect(element.hasClass('existingTrue')).toBeTruthy();
expect(element.hasClass('existingFalse')).toBeFalsy();

$rootScope.conditionB = function() { return true; };
$rootScope.$digest();
expect(element.hasClass('existing')).toBeTruthy();
expect(element.hasClass('A')).toBeTruthy();
expect(element.hasClass('B')).toBeTruthy();
expect(element.hasClass('AnotB')).toBeFalsy();
expect(element.hasClass('existingTrue')).toBeTruthy();
expect(element.hasClass('existingFalse')).toBeFalsy();
}));


Expand Down