Skip to content

chore(focus-origin-monitor): remove unused method parameter #4636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/demo-app/style/style-demo.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<button #b class="demo-focusable" cdkMonitorElementFocus>focus me!</button>
<button (click)="b.focus()">focus programmatically</button>

<button (click)="fom.focusVia(b, renderer, 'mouse')">focusVia: mouse</button>
<button (click)="fom.focusVia(b, renderer, 'touch')">focusVia: touch</button>
<button (click)="fom.focusVia(b, renderer, 'keyboard')">focusVia: keyboard</button>
<button (click)="fom.focusVia(b, renderer, 'program')">focusVia: program</button>
<button (click)="fom.focusVia(b, 'mouse')">focusVia: mouse</button>
<button (click)="fom.focusVia(b, 'touch')">focusVia: touch</button>
<button (click)="fom.focusVia(b, 'keyboard')">focusVia: keyboard</button>
<button (click)="fom.focusVia(b, 'program')">focusVia: program</button>

<div>Active classes: {{b.classList}}</div>

Expand Down
2 changes: 1 addition & 1 deletion src/lib/checkbox/checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,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) {
Expand Down
8 changes: 4 additions & 4 deletions src/lib/core/style/focus-origin-monitor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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(() => {
Expand All @@ -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(() => {
Expand All @@ -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(() => {
Expand Down
3 changes: 1 addition & 2 deletions src/lib/core/style/focus-origin-monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/radio/radio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,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');
}

ngOnInit() {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/slide-toggle/slide-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,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. */
Expand Down