Skip to content

Commit d6adfc6

Browse files
committed
fix(typings): add more missing typings.
This is the same bug pattern I reported in microsoft/TypeScript#5187
1 parent 31f48ae commit d6adfc6

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

modules/angular2/src/core/compiler/selector.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export class SelectorMatcher {
260260
* @param matchedCallback This callback will be called with the object handed into `addSelectable`
261261
* @return boolean true if a match was found
262262
*/
263-
match(cssSelector: CssSelector, matchedCallback: (CssSelector, any) => void): boolean {
263+
match(cssSelector: CssSelector, matchedCallback: (c: CssSelector, a: any) => void): boolean {
264264
var result = false;
265265
var element = cssSelector.element;
266266
var classNames = cssSelector.classNames;
@@ -313,7 +313,7 @@ export class SelectorMatcher {
313313
}
314314

315315
_matchTerminal(map: Map<string, SelectorContext[]>, name, cssSelector: CssSelector,
316-
matchedCallback: (CssSelector, any) => void): boolean {
316+
matchedCallback: (c: CssSelector, a: any) => void): boolean {
317317
if (isBlank(map) || isBlank(name)) {
318318
return false;
319319
}
@@ -336,7 +336,7 @@ export class SelectorMatcher {
336336
}
337337

338338
_matchPartial(map: Map<string, SelectorMatcher>, name, cssSelector: CssSelector,
339-
matchedCallback /*: (CssSelector, any) => void*/): boolean {
339+
matchedCallback /*: (c: CssSelector, a: any) => void*/): boolean {
340340
if (isBlank(map) || isBlank(name)) {
341341
return false;
342342
}
@@ -367,7 +367,7 @@ export class SelectorContext {
367367
this.notSelectors = selector.notSelectors;
368368
}
369369

370-
finalize(cssSelector: CssSelector, callback: (CssSelector, any) => void): boolean {
370+
finalize(cssSelector: CssSelector, callback: (c: CssSelector, a: any) => void): boolean {
371371
var result = true;
372372
if (this.notSelectors.length > 0 &&
373373
(isBlank(this.listContext) || !this.listContext.alreadyMatched)) {

modules/angular2/src/core/render/dom/events/key_events.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone';
1212
import {Injectable} from 'angular2/src/core/di';
1313

1414
var modifierKeys = ['alt', 'control', 'meta', 'shift'];
15-
var modifierKeyGetters: {[key: string]: Function} = {
16-
'alt': (event) => event.altKey,
17-
'control': (event) => event.ctrlKey,
18-
'meta': (event) => event.metaKey,
19-
'shift': (event) => event.shiftKey
15+
var modifierKeyGetters: {[key: string]: (event: KeyboardEvent) => boolean} = {
16+
'alt': (event: KeyboardEvent) => event.altKey,
17+
'control': (event: KeyboardEvent) => event.ctrlKey,
18+
'meta': (event: KeyboardEvent) => event.metaKey,
19+
'shift': (event: KeyboardEvent) => event.shiftKey
2020
};
2121

2222
@Injectable()
@@ -69,7 +69,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
6969
return result;
7070
}
7171

72-
static getEventFullKey(event: Event): string {
72+
static getEventFullKey(event: KeyboardEvent): string {
7373
var fullKey = '';
7474
var key = DOM.getEventKey(event);
7575
key = key.toLowerCase();
@@ -91,7 +91,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
9191
}
9292

9393
static eventCallback(element: HTMLElement, fullKey: any, handler: (Event) => any, zone: NgZone):
94-
(event: Event) => void {
94+
(event: KeyboardEvent) => void {
9595
return (event) => {
9696
if (StringWrapper.equals(KeyEventsPlugin.getEventFullKey(event), fullKey)) {
9797
zone.run(() => handler(event));

modules/angular2/src/core/zone/ng_zone.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class NgZone {
9090
_onTurnStart: () => void;
9191
_onTurnDone: () => void;
9292
_onEventDone: () => void;
93-
_onErrorHandler: (error, stack) => void;
93+
_onErrorHandler: (error: any, stack: any) => void;
9494

9595
// Number of microtasks pending from _innerZone (& descendants)
9696
_pendingMicrotasks: number;

npm-shrinkwrap.clean.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10956,7 +10956,7 @@
1095610956
}
1095710957
},
1095810958
"ts2dart": {
10959-
"version": "0.7.11",
10959+
"version": "0.7.12",
1096010960
"dependencies": {
1096110961
"source-map": {
1096210962
"version": "0.4.4",

npm-shrinkwrap.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"temp": "^0.8.1",
129129
"ternary-stream": "^1.2.3",
130130
"through2": "^0.6.1",
131-
"ts2dart": "^0.7.11",
131+
"ts2dart": "^0.7.12",
132132
"tsd": "^0.6.5-beta",
133133
"tslint": "^2.5.0",
134134
"typescript": "^1.6.2",

0 commit comments

Comments
 (0)