Skip to content

Commit c4923d2

Browse files
committed
Address feedback
1 parent cb04e37 commit c4923d2

File tree

13 files changed

+31
-29
lines changed

13 files changed

+31
-29
lines changed

src/demo-app/style/style-demo.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<button #b class="demo-focusable" cdkMonitorElementFocus>focus me!</button>
22
<button (click)="b.focus()">focus programmatically</button>
33

4-
<button (click)="fom.focusVia(b, 'mouse')">focusVia: mouse</button>
5-
<button (click)="fom.focusVia(b, 'touch')">focusVia: touch</button>
6-
<button (click)="fom.focusVia(b, 'keyboard')">focusVia: keyboard</button>
7-
<button (click)="fom.focusVia(b, 'program')">focusVia: program</button>
4+
<button (click)="fom.focusVia(b, renderer, 'mouse')">focusVia: mouse</button>
5+
<button (click)="fom.focusVia(b, renderer, 'touch')">focusVia: touch</button>
6+
<button (click)="fom.focusVia(b, renderer, 'keyboard')">focusVia: keyboard</button>
7+
<button (click)="fom.focusVia(b, renderer, 'program')">focusVia: program</button>
88

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

src/demo-app/style/style-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ import {FocusOriginMonitor} from '@angular/material';
99
styleUrls: ['style-demo.css'],
1010
})
1111
export class StyleDemo {
12-
constructor(public fom: FocusOriginMonitor) {}
12+
constructor(public renderer: Renderer2, public fom: FocusOriginMonitor) {}
1313
}

src/lib/checkbox/checkbox.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,8 @@ class SingleCheckbox {
814814
checkboxColor: string = 'primary';
815815
checkboxValue: string = 'single_checkbox';
816816

817-
onCheckboxClick(_event: Event) {}
818-
onCheckboxChange(_event: MdCheckboxChange) {}
817+
onCheckboxClick: (event?: Event) => void = () => {};
818+
onCheckboxChange: (event?: MdCheckboxChange) => void = () => {};
819819
}
820820

821821
/** Simple component for testing an MdCheckbox with ngModel. */

src/lib/checkbox/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase
372372

373373
/** Focuses the checkbox. */
374374
focus(): void {
375-
this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
375+
this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, this._renderer, 'keyboard');
376376
}
377377

378378
_onInteractionEvent(event: Event) {

src/lib/chips/chip-list.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,6 @@ class StaticChipList {
238238
selectable: boolean = true;
239239
remove: number;
240240

241-
chipSelect(_index: number) {}
242-
chipDeselect(_index: number) {}
241+
chipSelect: (index?: number) => void = () => {};
242+
chipDeselect: (index?: number) => void = () => {};
243243
}

src/lib/chips/chip.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ class SingleChip {
135135
selected: boolean = false;
136136
shouldShow: boolean = true;
137137

138-
chipFocus(_event: MdChipEvent) {}
139-
chipDestroy(_event: MdChipEvent) {}
140-
chipSelect(_event: MdChipEvent) {}
141-
chipDeselect(_event: MdChipEvent) {}
138+
chipFocus: (event?: MdChipEvent) => void = () => {};
139+
chipDestroy: (event?: MdChipEvent) => void = () => {};
140+
chipSelect: (event?: MdChipEvent) => void = () => {};
141+
chipDeselect: (event?: MdChipEvent) => void = () => {};
142142
}
143143

144144
@Component({

src/lib/core/datetime/native-date-adapter.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ const DEFAULT_DAY_OF_WEEK_NAMES = {
3131

3232
/** Creates an array and fills it with values. */
3333
function range<T>(length: number, valueFunction: (index: number) => T): T[] {
34-
return Array.apply(null, Array(length)).map((_v: undefined, i: number) => valueFunction(i));
34+
const valuesArray = [];
35+
for (let i = 0; i < length; i++) {
36+
valuesArray[i] = valueFunction(i);
37+
}
38+
return valuesArray;
3539
}
3640

3741

src/lib/core/style/focus-origin-monitor.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ describe('FocusOriginMonitor', () => {
131131
}));
132132

133133
it('focusVia keyboard should simulate keyboard focus', async(() => {
134-
focusOriginMonitor.focusVia(buttonElement, 'keyboard');
134+
focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'keyboard');
135135
fixture.detectChanges();
136136

137137
setTimeout(() => {
@@ -148,7 +148,7 @@ describe('FocusOriginMonitor', () => {
148148
}));
149149

150150
it('focusVia mouse should simulate mouse focus', async(() => {
151-
focusOriginMonitor.focusVia(buttonElement, 'mouse');
151+
focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'mouse');
152152
fixture.detectChanges();
153153

154154
setTimeout(() => {
@@ -165,7 +165,7 @@ describe('FocusOriginMonitor', () => {
165165
}));
166166

167167
it('focusVia mouse should simulate mouse focus', async(() => {
168-
focusOriginMonitor.focusVia(buttonElement, 'touch');
168+
focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'touch');
169169
fixture.detectChanges();
170170

171171
setTimeout(() => {
@@ -182,7 +182,7 @@ describe('FocusOriginMonitor', () => {
182182
}));
183183

184184
it('focusVia program should simulate programmatic focus', async(() => {
185-
focusOriginMonitor.focusVia(buttonElement, 'program');
185+
focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'program');
186186
fixture.detectChanges();
187187

188188
setTimeout(() => {

src/lib/radio/radio.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('MdRadio', () => {
143143
expect(radioInstances[0].checked).toBe(false);
144144

145145
let spies = radioInstances
146-
.map((_value, index) => jasmine.createSpy(`onChangeSpy ${index}`));
146+
.map((radio, index) => jasmine.createSpy(`onChangeSpy ${index} for ${radio.name}`));
147147

148148
spies.forEach((spy, index) => radioInstances[index].change.subscribe(spy));
149149

src/lib/radio/radio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ export class MdRadioButton implements OnInit, AfterViewInit, OnDestroy {
462462

463463
/** Focuses the radio button. */
464464
focus(): void {
465-
this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
465+
this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, this._renderer, 'keyboard');
466466
}
467467

468468
/**

0 commit comments

Comments
 (0)