Merge branch 'master' of https://github.com/artsjedi/DefinitelyTyped into artsjedi-master

This commit is contained in:
basarat
2013-08-27 02:45:52 +10:00
2 changed files with 9 additions and 9 deletions
+8 -8
View File
@@ -185,16 +185,16 @@ declare module createjs {
static stop(): boolean;
// events
loadComplete: () => any;
static loadComplete: () => any;
// EventDispatcher mixins
addEventListener(type: string, listener: (eventObj: Object) => boolean): any;
removeEventListener(type: string, listener: (eventObj: Function) => boolean): void;
removeEventListener(type: string, listener: (eventObj: Object) => boolean): void;
removeAllEventListeners(type: string): void;
dispatchEvent(eventObj: string, target: Object): boolean;
dispatchEvent(eventObj: Object, target: Object): boolean;
hasEventListener(type: string): boolean;
static addEventListener(type: string, listener: (eventObj: Object) => boolean): any;
static removeEventListener(type: string, listener: (eventObj: Function) => boolean): void;
static removeEventListener(type: string, listener: (eventObj: Object) => boolean): void;
static removeAllEventListeners(type: string): void;
static dispatchEvent(eventObj: string, target: Object): boolean;
static dispatchEvent(eventObj: Object, target: Object): boolean;
static hasEventListener(type: string): boolean;
}
export class BrowserDetect {
+1 -1
View File
@@ -132,7 +132,7 @@ declare module createjs {
static tick(delta: number, paused: boolean): void;
to(props: Object, duration?: number, ease?: (amount: number) => number): Tween;
toString(): string;
wait(duration: number): void;
wait(duration: number): Tween;
// events
change: (event) => any;