Skip to content
Closed
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 modules/angular2/src/core/compiler/selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export class SelectorMatcher {
* @param matchedCallback This callback will be called with the object handed into `addSelectable`
* @return boolean true if a match was found
*/
match(cssSelector: CssSelector, matchedCallback: (CssSelector, any) => void): boolean {
match(cssSelector: CssSelector, matchedCallback: (c: CssSelector, a: any) => void): boolean {
var result = false;
var element = cssSelector.element;
var classNames = cssSelector.classNames;
Expand Down Expand Up @@ -313,7 +313,7 @@ export class SelectorMatcher {
}

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

_matchPartial(map: Map<string, SelectorMatcher>, name, cssSelector: CssSelector,
matchedCallback /*: (CssSelector, any) => void*/): boolean {
matchedCallback /*: (c: CssSelector, a: any) => void*/): boolean {
if (isBlank(map) || isBlank(name)) {
return false;
}
Expand Down Expand Up @@ -367,7 +367,7 @@ export class SelectorContext {
this.notSelectors = selector.notSelectors;
}

finalize(cssSelector: CssSelector, callback: (CssSelector, any) => void): boolean {
finalize(cssSelector: CssSelector, callback: (c: CssSelector, a: any) => void): boolean {
var result = true;
if (this.notSelectors.length > 0 &&
(isBlank(this.listContext) || !this.listContext.alreadyMatched)) {
Expand Down
14 changes: 7 additions & 7 deletions modules/angular2/src/core/render/dom/events/key_events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone';
import {Injectable} from 'angular2/src/core/di';

var modifierKeys = ['alt', 'control', 'meta', 'shift'];
var modifierKeyGetters: {[key: string]: Function} = {
'alt': (event) => event.altKey,
'control': (event) => event.ctrlKey,
'meta': (event) => event.metaKey,
'shift': (event) => event.shiftKey
var modifierKeyGetters: {[key: string]: (event: KeyboardEvent) => boolean} = {
'alt': (event: KeyboardEvent) => event.altKey,
'control': (event: KeyboardEvent) => event.ctrlKey,
'meta': (event: KeyboardEvent) => event.metaKey,
'shift': (event: KeyboardEvent) => event.shiftKey
};

@Injectable()
Expand Down Expand Up @@ -69,7 +69,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
return result;
}

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

static eventCallback(element: HTMLElement, fullKey: any, handler: (Event) => any, zone: NgZone):
(event: Event) => void {
(event: KeyboardEvent) => void {
return (event) => {
if (StringWrapper.equals(KeyEventsPlugin.getEventFullKey(event), fullKey)) {
zone.run(() => handler(event));
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/core/zone/ng_zone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class NgZone {
_onTurnStart: () => void;
_onTurnDone: () => void;
_onEventDone: () => void;
_onErrorHandler: (error, stack) => void;
_onErrorHandler: (error: any, stack: any) => void;

// Number of microtasks pending from _innerZone (& descendants)
_pendingMicrotasks: number;
Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.clean.json
Original file line number Diff line number Diff line change
Expand Up @@ -10956,7 +10956,7 @@
}
},
"ts2dart": {
"version": "0.7.11",
"version": "0.7.12",
"dependencies": {
"source-map": {
"version": "0.4.4",
Expand Down
6 changes: 3 additions & 3 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"temp": "^0.8.1",
"ternary-stream": "^1.2.3",
"through2": "^0.6.1",
"ts2dart": "^0.7.11",
"ts2dart": "^0.7.12",
"tsd": "^0.6.5-beta",
"tslint": "^2.5.0",
"typescript": "^1.6.2",
Expand Down