From c9958365728a32d9d7ae6e5cae750e584abf37d7 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Wed, 6 Mar 2013 17:25:12 -0800 Subject: [PATCH 1/3] Added missing easeljs overrides for addEventListener() and removeEventListener() --- easeljs/easeljs.d.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 979745753..6c85740cc 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -80,9 +80,13 @@ module createjs { // EventDispatcher mixins addEventListener(type: string, listener: (eventObj: Object) => bool): Function; - addEventListener(type: string, listener: (eventObj: Object) => bool): Object; - removeEventListener(type: string, listener: (eventObj: Function) => bool): void; + addEventListener(type: string, listener: (eventObj: Object) => void): Function; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): Object; removeEventListener(type: string, listener: (eventObj: Object) => bool): void; + removeEventListener(type: string, listener: (eventObj: Object) => void): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; removeAllEventListeners(type: string): void; dispatchEvent(eventObj: string, target: Object): bool; dispatchEvent(eventObj: Object, target: Object): bool; @@ -293,9 +297,13 @@ module createjs { static initialize(target: Object): void; addEventListener(type: string, listener: (eventObj: Object) => bool): Function; - addEventListener(type: string, listener: (eventObj: Object) => bool): Object; - removeEventListener(type: string, listener: (eventObj: Function) => bool): void; - removeEventListener(type: string, listener: (eventObj: Object) => bool): void; + addEventListener(type: string, listener: (eventObj: Object) => void): Function; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): Object; + removeEventListener(type: string, listener: (eventObj: Object) => bool): void; + removeEventListener(type: string, listener: (eventObj: Object) => void): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; removeAllEventListeners(type: string): void; dispatchEvent(eventObj: string, target: Object): bool; dispatchEvent(eventObj: Object, target: Object): bool; From c2b36b521a7280b5fdce0ed5a24cef208070e1ef Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Wed, 6 Mar 2013 17:25:49 -0800 Subject: [PATCH 2/3] Added missing easeljs EventDispatcher mixins on Ticker --- easeljs/easeljs.d.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index 6c85740cc..a8199dab5 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -642,6 +642,16 @@ module createjs { static setInterval(interval: number): void; static setPaused(value: bool): void; + // EventDispatcher mixins + static addEventListener(type: string, listener: (eventObj: Object) => bool): Function; + static addEventListener(type: string, listener: (eventObj: Object) => void): Function; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): Object; + static removeEventListener(type: string, listener: (eventObj: Object) => bool): void; + static removeEventListener(type: string, listener: (eventObj: Object) => void): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; + // events tick: (timeElapsed: number) => any; } From be546bbcae42ebd988c8cf549daa8c42eab386d4 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Wed, 6 Mar 2013 17:27:03 -0800 Subject: [PATCH 3/3] converted random tabs in easejs to match the majority of spaces --- easeljs/easeljs.d.ts | 106 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index a8199dab5..2739c5746 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -78,19 +78,19 @@ module createjs { mousedown: (event: MouseEvent) => any; tick: () => any; - // EventDispatcher mixins - addEventListener(type: string, listener: (eventObj: Object) => bool): Function; + // EventDispatcher mixins + addEventListener(type: string, listener: (eventObj: Object) => bool): Function; addEventListener(type: string, listener: (eventObj: Object) => void): Function; - addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): Object; - removeEventListener(type: string, listener: (eventObj: Object) => bool): void; + removeEventListener(type: string, listener: (eventObj: Object) => bool): void; removeEventListener(type: string, listener: (eventObj: Object) => void): void; removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): void; - removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; - removeAllEventListeners(type: string): void; - dispatchEvent(eventObj: string, target: Object): bool; - dispatchEvent(eventObj: Object, target: Object): bool; - hasEventListener(type: string): bool; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; + removeAllEventListeners(type: string): void; + dispatchEvent(eventObj: string, target: Object): bool; + dispatchEvent(eventObj: Object, target: Object): bool; + hasEventListener(type: string): bool; } @@ -170,20 +170,20 @@ module createjs { onAnimationEnd: (event: Object) => any; } - export class ButtonHelper { - // properties - target: Object; - overLabel: string; - outLabel: string; - downLabel: string; - play: bool; + export class ButtonHelper { + // properties + target: Object; + overLabel: string; + outLabel: string; + downLabel: string; + play: bool; - // methods - constructor(target: MovieClip, outLabel: string, overLabel: string, downLabel: string, play: bool, hitArea: DisplayObject, hitLabel: string); - constructor(target: BitmapAnimation, outLabel: string, overLabel: string, downLabel: string, play: bool, hitArea: DisplayObject, hitLabel: string); - setEnabled(value: bool); - toString(): string; - } + // methods + constructor(target: MovieClip, outLabel: string, overLabel: string, downLabel: string, play: bool, hitArea: DisplayObject, hitLabel: string); + constructor(target: BitmapAnimation, outLabel: string, overLabel: string, downLabel: string, play: bool, hitArea: DisplayObject, hitLabel: string); + setEnabled(value: bool); + toString(): string; + } export class BoxBlurFilter extends Filter { // properties @@ -284,31 +284,31 @@ module createjs { export class EaselJS { - // properties - version: string; - buildDate: string; + // properties + version: string; + buildDate: string; } export class EventDispatcher { - // properties + // properties - // methods - static initialize(target: Object): void; + // methods + static initialize(target: Object): void; - addEventListener(type: string, listener: (eventObj: Object) => bool): Function; + addEventListener(type: string, listener: (eventObj: Object) => bool): Function; addEventListener(type: string, listener: (eventObj: Object) => void): Function; - addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): Object; addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): Object; removeEventListener(type: string, listener: (eventObj: Object) => bool): void; - removeEventListener(type: string, listener: (eventObj: Object) => void): void; + removeEventListener(type: string, listener: (eventObj: Object) => void): void; removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => bool; }): void; removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }): void; - removeAllEventListeners(type: string): void; - dispatchEvent(eventObj: string, target: Object): bool; - dispatchEvent(eventObj: Object, target: Object): bool; - hasEventListener(type: string): bool; - toString(): string; + removeAllEventListeners(type: string): void; + dispatchEvent(eventObj: string, target: Object): bool; + dispatchEvent(eventObj: Object, target: Object): bool; + hasEventListener(type: string): bool; + toString(): string; } @@ -360,20 +360,20 @@ module createjs { } - export class Log { - // properties - static NONE: number; - static ERROR: number; - static WARNING: number; - static TRACE: number; - static ALL: number; - static level: number; + export class Log { + // properties + static NONE: number; + static ERROR: number; + static WARNING: number; + static TRACE: number; + static ALL: number; + static level: number; - // methods - static out(message: string, details: string, level: number); - static addKeys(keys: Object); - static log(message: string, details: string, level: number); - } + // methods + static out(message: string, details: string, level: number); + static addKeys(keys: Object); + static log(message: string, details: string, level: number); + } export class Matrix2D { // properties @@ -560,8 +560,8 @@ module createjs { toString(): string; // events - complete: (event: Object) => any; - onProgress: (event: Object) => any; + complete: (event: Object) => any; + onProgress: (event: Object) => any; } @@ -590,11 +590,11 @@ module createjs { constructor (canvas: HTMLCanvasElement); clone(): Stage; enableMouseOver(frequency: number): void; - enableDOMEvents(enable: bool): void; + enableDOMEvents(enable: bool): void; toDataURL(backgroundColor: string, mimeType: string): string; update(): void; clear(): void; - handleEvent(evt: Object): void; + handleEvent(evt: Object): void; // events stagemousemove: (event: MouseEvent) => any;