fix(slide-toggle): fix unavailable unmonitor call (#3862)

* fix(slide-toggle): fix unavailable unmonitor call

* Remove variable
This commit is contained in:
Paul Gschwendtner
2017-03-31 20:50:43 +02:00
committed by tinayuangao
parent 724170df24
commit 904c71e17f
2 changed files with 3 additions and 12 deletions
+1 -1
View File
@@ -363,7 +363,7 @@ describe('MdCheckbox', () => {
expect(fixture.nativeElement.querySelectorAll('.mat-ripple-element').length)
.toBe(0, 'Expected no ripples to be present.');
fakeFocusOriginMonitorSubject.next('program');
dispatchFakeEvent(inputElement, 'focus');
tick(RIPPLE_FADE_IN_DURATION);
expect(fixture.nativeElement.querySelectorAll('.mat-ripple-element').length)
+2 -11
View File
@@ -23,7 +23,6 @@ import {
} from '../core';
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
import {Observable} from 'rxjs/Observable';
import {Subscription} from 'rxjs/Subscription';
export const MD_SLIDE_TOGGLE_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR,
@@ -77,9 +76,6 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
/** Reference to the focus state ripple. */
private _focusRipple: RippleRef;
/** Subscription to focus-origin changes. */
private _focusOriginSubscription: Subscription;
/** Name value will be applied to the input element if present */
@Input() name: string = null;
@@ -133,18 +129,13 @@ export class MdSlideToggle implements OnDestroy, AfterContentInit, ControlValueA
ngAfterContentInit() {
this._slideRenderer = new SlideToggleRenderer(this._elementRef);
this._focusOriginSubscription = this._focusOriginMonitor
this._focusOriginMonitor
.monitor(this._inputElement.nativeElement, this._renderer, false)
.subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
}
ngOnDestroy() {
this._focusOriginMonitor.unmonitor(this._inputElement.nativeElement);
if (this._focusOriginSubscription) {
this._focusOriginSubscription.unsubscribe();
this._focusOriginSubscription = null;
}
this._focusOriginMonitor.stopMonitoring(this._inputElement.nativeElement);
}
/**