Revert "fix(animations): make sure @.disabled works in non-animation components"

This reverts commit 01a2688848.
This commit is contained in:
Alex Rickabaugh
2017-07-14 11:00:29 -07:00
parent 01a2688848
commit f7686d4124
3 changed files with 22 additions and 86 deletions

View File

@ -1815,12 +1815,12 @@ export function main() {
selector: 'my-cmp',
template: `
<div class="parent" [@parent]="exp" (@parent.done)="cb('all','done', $event)">
<div *ngFor="let item of items"
<div *ngFor="let item of items"
class="item item-{{ item }}"
@child
(@child.start)="cb('c-' + item, 'start', $event)"
(@child.done)="cb('c-' + item, 'done', $event)">
{{ item }}
{{ item }}
</div>
</div>
`,
@ -2153,57 +2153,6 @@ export function main() {
expect(cmp.startEvent.totalTime).toEqual(9876);
// the done event isn't fired because it's an actual animation
}));
it('should work when there are no animations on the component handling the disable/enable flag',
() => {
@Component({
selector: 'parent-cmp',
template: `
<div [@.disabled]="disableExp">
<child-cmp #child></child-cmp>
</div>
`
})
class ParentCmp {
@ViewChild('child') public child: ChildCmp|null = null;
disableExp = false;
}
@Component({
selector: 'child-cmp',
template: `
<div [@myAnimation]="exp"></div>
`,
animations: [trigger(
'myAnimation',
[transition(
'* => go, * => goAgain',
[style({opacity: 0}), animate('1s', style({opacity: 1}))])])]
})
class ChildCmp {
public exp = '';
}
TestBed.configureTestingModule({declarations: [ParentCmp, ChildCmp]});
const fixture = TestBed.createComponent(ParentCmp);
const cmp = fixture.componentInstance;
cmp.disableExp = true;
fixture.detectChanges();
resetLog();
const child = cmp.child !;
child.exp = 'go';
fixture.detectChanges();
expect(getLog().length).toEqual(0);
resetLog();
cmp.disableExp = false;
child.exp = 'goAgain';
fixture.detectChanges();
expect(getLog().length).toEqual(1);
});
});
});