From 1a2a01ba006ea40a3e0f684674cf9532b5590f4a Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 31 Mar 2017 20:09:32 +0200 Subject: [PATCH 1/2] fix(slide-toggle): fix unavailable unmonitor call --- src/lib/checkbox/checkbox.spec.ts | 2 +- src/lib/slide-toggle/slide-toggle.ts | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts index 48a4c1a15acf..10d86e54f58d 100644 --- a/src/lib/checkbox/checkbox.spec.ts +++ b/src/lib/checkbox/checkbox.spec.ts @@ -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) diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts index 68b98cece2f0..4a4d0bae72d0 100644 --- a/src/lib/slide-toggle/slide-toggle.ts +++ b/src/lib/slide-toggle/slide-toggle.ts @@ -133,18 +133,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); } /** From b7db5c6ad84840978c6930434ccf9bf737205755 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 31 Mar 2017 20:14:03 +0200 Subject: [PATCH 2/2] Remove variable --- src/lib/slide-toggle/slide-toggle.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts index 4a4d0bae72d0..864eba4288db 100644 --- a/src/lib/slide-toggle/slide-toggle.ts +++ b/src/lib/slide-toggle/slide-toggle.ts @@ -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;