honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(common): properly take className changes into account (#21937) 

Fixes #21932

PR Close #21937
This commit is contained in:
Pawel Kozlowski 2018-01-31 17:57:37 +01:00 committed by Alex Rickabaugh
parent 5c8340aae0
commit 4a426696c9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/common/src/directives/ng_class.ts
View File

@ -126,7 +126,7 @@ export class NgClass implements DoCheck {
(<any>rawClassVal).forEach((klass: string) => this._toggleClass(klass, !isCleanup)); (<any>rawClassVal).forEach((klass: string) => this._toggleClass(klass, !isCleanup));
} else { } else {
Object.keys(rawClassVal).forEach(klass => { Object.keys(rawClassVal).forEach(klass => {
if (rawClassVal[klass] != null) this._toggleClass(klass, !isCleanup); this._toggleClass(klass, isCleanup ? false : !!rawClassVal[klass]);
}); });
} }
} }

11
packages/common/test/directives/ng_class_spec.ts
View File

@ -290,6 +290,17 @@ import {ComponentFixture, TestBed, async} from '@angular/core/testing';
detectChangesAndExpectClassName(`init foo`); detectChangesAndExpectClassName(`init foo`);
})); }));
it('should co-operate with the interpolated class attribute when interpolation changes',
async(() => {
fixture = createTestComponent(
`<div [ngClass]="{large: false, small: true}" class="{{strExpr}}"></div>`);
detectChangesAndExpectClassName(`foo small`);
getComponent().strExpr = 'bar';
detectChangesAndExpectClassName(`bar small`);
}));
it('should co-operate with the class attribute and binding to it', async(() => { it('should co-operate with the class attribute and binding to it', async(() => {
fixture = fixture =
createTestComponent(`<div [ngClass]="objExpr" class="init" [class]="'foo'"></div>`); createTestComponent(`<div [ngClass]="objExpr" class="init" [class]="'foo'"></div>`);