fix(CSSClass): change selector to ng-class
BREAKING CHANGE: The selector for the CSSClass directive was changed from [class] to [ng-class]. The directive itself was renamed from CSSClass to NgClass Closes #3498
This commit is contained in:
parent
748c2d6c97
commit
ff1b110ae1
|
@ -10,7 +10,7 @@ import {NgIf} from './src/directives/ng_if';
|
||||||
import {NgNonBindable} from './src/directives/ng_non_bindable';
|
import {NgNonBindable} from './src/directives/ng_non_bindable';
|
||||||
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/directives/ng_switch';
|
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/directives/ng_switch';
|
||||||
|
|
||||||
export * from './src/directives/class';
|
export * from './src/directives/ng_class';
|
||||||
export * from './src/directives/ng_for';
|
export * from './src/directives/ng_for';
|
||||||
export * from './src/directives/ng_if';
|
export * from './src/directives/ng_if';
|
||||||
export * from './src/directives/ng_non_bindable';
|
export * from './src/directives/ng_non_bindable';
|
||||||
|
|
|
@ -94,7 +94,7 @@ Example:
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
```
|
```
|
||||||
<div [class]="stringify(selected)">
|
<div [title]="stringify(selected)">
|
||||||
```
|
```
|
||||||
</pre>
|
</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -25,17 +25,17 @@ import {ListWrapper, StringMapWrapper, isListLikeIterable} from 'angular2/src/fa
|
||||||
* # Example:
|
* # Example:
|
||||||
*
|
*
|
||||||
* ```
|
* ```
|
||||||
* <div class="message" [class]="{error: errorCount > 0}">
|
* <div class="message" [ng-class]="{error: errorCount > 0}">
|
||||||
* Please check errors.
|
* Please check errors.
|
||||||
* </div>
|
* </div>
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[class]',
|
selector: '[ng-class]',
|
||||||
lifecycle: [LifecycleEvent.onCheck, LifecycleEvent.onDestroy],
|
lifecycle: [LifecycleEvent.onCheck, LifecycleEvent.onDestroy],
|
||||||
properties: ['rawClass: class']
|
properties: ['rawClass: ng-class']
|
||||||
})
|
})
|
||||||
export class CSSClass {
|
export class NgClass {
|
||||||
private _differ: any;
|
private _differ: any;
|
||||||
private _mode: string;
|
private _mode: string;
|
||||||
_rawClass;
|
_rawClass;
|
|
@ -19,7 +19,7 @@ export class CompileElement {
|
||||||
// inherited down to children if they don't have an own elementBinder
|
// inherited down to children if they don't have an own elementBinder
|
||||||
inheritedElementBinder: ElementBinderBuilder = null;
|
inheritedElementBinder: ElementBinderBuilder = null;
|
||||||
compileChildren: boolean = true;
|
compileChildren: boolean = true;
|
||||||
elementDescription: string; // e.g. '<div [class]="foo">' : used to provide context in case of
|
elementDescription: string; // e.g. '<div [title]="foo">' : used to provide context in case of
|
||||||
// error
|
// error
|
||||||
|
|
||||||
constructor(public element, compilationUnit: string = '') {
|
constructor(public element, compilationUnit: string = '') {
|
||||||
|
|
|
@ -15,8 +15,7 @@ import {
|
||||||
} from 'angular2/test_lib';
|
} from 'angular2/test_lib';
|
||||||
import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
|
import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
|
||||||
import {Component, View, NgFor, bind} from 'angular2/angular2';
|
import {Component, View, NgFor, bind} from 'angular2/angular2';
|
||||||
import {DOM} from 'angular2/src/dom/dom_adapter';
|
import {NgClass} from 'angular2/src/directives/ng_class';
|
||||||
import {CSSClass} from 'angular2/src/directives/class';
|
|
||||||
import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
|
import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
|
||||||
|
|
||||||
export function main() {
|
export function main() {
|
||||||
|
@ -27,7 +26,7 @@ export function main() {
|
||||||
|
|
||||||
it('should clean up when the directive is destroyed',
|
it('should clean up when the directive is destroyed',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div *ng-for="var item of items" [class]="item"></div>';
|
var template = '<div *ng-for="var item of items" [ng-class]="item"></div>';
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
.then((rootTC) => {
|
.then((rootTC) => {
|
||||||
|
@ -48,7 +47,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add classes specified in an object literal',
|
it('should add classes specified in an object literal',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="{foo: true, bar: false}"></div>';
|
var template = '<div [ng-class]="{foo: true, bar: false}"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -64,7 +63,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add classes specified in an object literal without change in class names',
|
it('should add classes specified in an object literal without change in class names',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = `<div [class]="{'foo-bar': true, 'fooBar': true}"></div>`;
|
var template = `<div [ng-class]="{'foo-bar': true, 'fooBar': true}"></div>`;
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -79,7 +78,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes based on changes in object literal values',
|
it('should add and remove classes based on changes in object literal values',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="{foo: condition, bar: !condition}"></div>';
|
var template = '<div [ng-class]="{foo: condition, bar: !condition}"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -99,7 +98,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes based on changes to the expression object',
|
it('should add and remove classes based on changes to the expression object',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="objExpr"></div>';
|
var template = '<div [ng-class]="objExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -129,7 +128,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes based on reference changes to the expression object',
|
it('should add and remove classes based on reference changes to the expression object',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="objExpr"></div>';
|
var template = '<div [ng-class]="objExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -157,7 +156,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add classes specified in a list literal',
|
it('should add classes specified in a list literal',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = `<div [class]="['foo', 'bar', 'foo-bar', 'fooBar']"></div>`;
|
var template = `<div [ng-class]="['foo', 'bar', 'foo-bar', 'fooBar']"></div>`;
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -172,7 +171,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes based on changes to the expression',
|
it('should add and remove classes based on changes to the expression',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="arrExpr"></div>';
|
var template = '<div [ng-class]="arrExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -205,7 +204,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes when a reference changes',
|
it('should add and remove classes when a reference changes',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="arrExpr"></div>';
|
var template = '<div [ng-class]="arrExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -228,7 +227,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add classes specified in a string literal',
|
it('should add classes specified in a string literal',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = `<div [class]="'foo bar foo-bar fooBar'"></div>`;
|
var template = `<div [ng-class]="'foo bar foo-bar fooBar'"></div>`;
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -243,7 +242,7 @@ export function main() {
|
||||||
|
|
||||||
it('should add and remove classes based on changes to the expression',
|
it('should add and remove classes based on changes to the expression',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="strExpr"></div>';
|
var template = '<div [ng-class]="strExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -269,7 +268,7 @@ export function main() {
|
||||||
|
|
||||||
it('should remove active classes when switching from string to null',
|
it('should remove active classes when switching from string to null',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = `<div [class]="strExpr"></div>`;
|
var template = `<div [ng-class]="strExpr"></div>`;
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -290,7 +289,7 @@ export function main() {
|
||||||
|
|
||||||
it('should remove active classes when expression evaluates to null',
|
it('should remove active classes when expression evaluates to null',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="objExpr"></div>';
|
var template = '<div [ng-class]="objExpr"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -313,25 +312,9 @@ export function main() {
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should have no effect when activated by a static class attribute',
|
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
|
||||||
var template = '<div class="init foo"></div>';
|
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
|
||||||
.createAsync(TestComponent)
|
|
||||||
.then((rootTC) => {
|
|
||||||
rootTC.detectChanges();
|
|
||||||
// TODO(pk): in CJS className isn't initialized properly if we don't mutate classes
|
|
||||||
expect(ListWrapper.join(DOM.classList(rootTC.componentViewChildren[0].nativeElement),
|
|
||||||
' '))
|
|
||||||
.toEqual('init foo ng-binding');
|
|
||||||
async.done();
|
|
||||||
});
|
|
||||||
}));
|
|
||||||
|
|
||||||
it('should co-operate with the class attribute',
|
it('should co-operate with the class attribute',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div [class]="objExpr" class="init foo"></div>';
|
var template = '<div [ng-class]="objExpr" class="init foo"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -352,7 +335,7 @@ export function main() {
|
||||||
|
|
||||||
it('should co-operate with the class attribute and class.name binding',
|
it('should co-operate with the class attribute and class.name binding',
|
||||||
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
|
||||||
var template = '<div class="init foo" [class]="objExpr" [class.baz]="condition"></div>';
|
var template = '<div class="init foo" [ng-class]="objExpr" [class.baz]="condition"></div>';
|
||||||
|
|
||||||
tcb.overrideTemplate(TestComponent, template)
|
tcb.overrideTemplate(TestComponent, template)
|
||||||
.createAsync(TestComponent)
|
.createAsync(TestComponent)
|
||||||
|
@ -383,7 +366,7 @@ export function main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Component({selector: 'test-cmp'})
|
@Component({selector: 'test-cmp'})
|
||||||
@View({directives: [CSSClass, NgFor]})
|
@View({directives: [NgClass, NgFor]})
|
||||||
class TestComponent {
|
class TestComponent {
|
||||||
condition: boolean = true;
|
condition: boolean = true;
|
||||||
items: any[];
|
items: any[];
|
Loading…
Reference in New Issue