diff --git a/src/demo-app/style/style-demo.html b/src/demo-app/style/style-demo.html index 81786735f85..7aa9e9a017a 100644 --- a/src/demo-app/style/style-demo.html +++ b/src/demo-app/style/style-demo.html @@ -1,10 +1,10 @@ - - - - + + + +
Active classes: {{b.classList}}
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts index 3f3fc279cbe..279d6efc8fe 100644 --- a/src/lib/checkbox/checkbox.ts +++ b/src/lib/checkbox/checkbox.ts @@ -372,7 +372,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase /** Focuses the checkbox. */ focus(): void { - this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, this._renderer, 'keyboard'); + this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard'); } _onInteractionEvent(event: Event) { diff --git a/src/lib/core/style/focus-origin-monitor.spec.ts b/src/lib/core/style/focus-origin-monitor.spec.ts index a6c3893186e..3b63018e6f9 100644 --- a/src/lib/core/style/focus-origin-monitor.spec.ts +++ b/src/lib/core/style/focus-origin-monitor.spec.ts @@ -131,7 +131,7 @@ describe('FocusOriginMonitor', () => { })); it('focusVia keyboard should simulate keyboard focus', async(() => { - focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'keyboard'); + focusOriginMonitor.focusVia(buttonElement, 'keyboard'); fixture.detectChanges(); setTimeout(() => { @@ -148,7 +148,7 @@ describe('FocusOriginMonitor', () => { })); it('focusVia mouse should simulate mouse focus', async(() => { - focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'mouse'); + focusOriginMonitor.focusVia(buttonElement, 'mouse'); fixture.detectChanges(); setTimeout(() => { @@ -165,7 +165,7 @@ describe('FocusOriginMonitor', () => { })); it('focusVia mouse should simulate mouse focus', async(() => { - focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'touch'); + focusOriginMonitor.focusVia(buttonElement, 'touch'); fixture.detectChanges(); setTimeout(() => { @@ -182,7 +182,7 @@ describe('FocusOriginMonitor', () => { })); it('focusVia program should simulate programmatic focus', async(() => { - focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'program'); + focusOriginMonitor.focusVia(buttonElement, 'program'); fixture.detectChanges(); setTimeout(() => { diff --git a/src/lib/core/style/focus-origin-monitor.ts b/src/lib/core/style/focus-origin-monitor.ts index eca5ebb5a18..cd27e6112ad 100644 --- a/src/lib/core/style/focus-origin-monitor.ts +++ b/src/lib/core/style/focus-origin-monitor.ts @@ -126,10 +126,9 @@ export class FocusOriginMonitor { /** * Focuses the element via the specified focus origin. * @param element The element to focus. - * @param renderer The renderer to use to invoke the focus method on the element. * @param origin The focus origin. */ - focusVia(element: HTMLElement, renderer: Renderer2, origin: FocusOrigin): void { + focusVia(element: HTMLElement, origin: FocusOrigin): void { this._setOriginForCurrentEventQueue(origin); element.focus(); } diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts index bc099bec099..a879e05ac8c 100644 --- a/src/lib/radio/radio.ts +++ b/src/lib/radio/radio.ts @@ -462,7 +462,7 @@ export class MdRadioButton implements OnInit, AfterViewInit, OnDestroy { /** Focuses the radio button. */ focus(): void { - this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, this._renderer, 'keyboard'); + this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard'); } /** diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts index 294e16a8e96..47165975f52 100644 --- a/src/lib/slide-toggle/slide-toggle.ts +++ b/src/lib/slide-toggle/slide-toggle.ts @@ -199,7 +199,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase /** Focuses the slide-toggle. */ focus() { - this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, this._renderer, 'keyboard'); + this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard'); } /** Whether the slide-toggle is checked. */