File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -618,27 +618,32 @@ describe('MdSlideToggle', () => {
618
618
619
619
let testComponent : SlideToggleWithFormControl ;
620
620
let slideToggle : MdSlideToggle ;
621
+ let inputElement : HTMLInputElement ;
621
622
622
623
beforeEach ( ( ) => {
623
624
fixture = TestBed . createComponent ( SlideToggleWithFormControl ) ;
624
625
fixture . detectChanges ( ) ;
625
626
626
627
testComponent = fixture . debugElement . componentInstance ;
627
628
slideToggle = fixture . debugElement . query ( By . directive ( MdSlideToggle ) ) . componentInstance ;
629
+ inputElement = fixture . debugElement . query ( By . css ( 'input' ) ) . nativeElement ;
628
630
} ) ;
629
631
630
632
it ( 'should toggle the disabled state' , ( ) => {
631
633
expect ( slideToggle . disabled ) . toBe ( false ) ;
634
+ expect ( inputElement . disabled ) . toBe ( false ) ;
632
635
633
636
testComponent . formControl . disable ( ) ;
634
637
fixture . detectChanges ( ) ;
635
638
636
639
expect ( slideToggle . disabled ) . toBe ( true ) ;
640
+ expect ( inputElement . disabled ) . toBe ( true ) ;
637
641
638
642
testComponent . formControl . enable ( ) ;
639
643
fixture . detectChanges ( ) ;
640
644
641
645
expect ( slideToggle . disabled ) . toBe ( false ) ;
646
+ expect ( inputElement . disabled ) . toBe ( false ) ;
642
647
} ) ;
643
648
} ) ;
644
649
} ) ;
Original file line number Diff line number Diff line change 1
1
import {
2
2
AfterContentInit ,
3
3
ChangeDetectionStrategy ,
4
+ ChangeDetectorRef ,
4
5
Component ,
5
6
ElementRef ,
6
7
EventEmitter ,
@@ -121,7 +122,8 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase
121
122
122
123
constructor ( private _elementRef : ElementRef ,
123
124
private _renderer : Renderer2 ,
124
- private _focusOriginMonitor : FocusOriginMonitor ) {
125
+ private _focusOriginMonitor : FocusOriginMonitor ,
126
+ private _changeDetectorRef : ChangeDetectorRef ) {
125
127
super ( ) ;
126
128
}
127
129
@@ -190,6 +192,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase
190
192
/** Implemented as a part of ControlValueAccessor. */
191
193
setDisabledState ( isDisabled : boolean ) : void {
192
194
this . disabled = isDisabled ;
195
+ this . _changeDetectorRef . markForCheck ( ) ;
193
196
}
194
197
195
198
/** Focuses the slide-toggle. */
You can’t perform that action at this time.
0 commit comments