diff --git a/createjs/createjs.d.ts b/createjs/createjs.d.ts index 7e6be561a..20f2a7574 100644 --- a/createjs/createjs.d.ts +++ b/createjs/createjs.d.ts @@ -65,23 +65,35 @@ declare module createjs { constructor(); // methods - addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; - addEventListener(type: string, listener: Object, useCapture?: boolean): any; + addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; dispatchEvent(eventObj: Object, target?: Object): boolean; dispatchEvent(eventObj: string, target?: Object): boolean; dispatchEvent(eventObj: Event, target?: Object): boolean; hasEventListener(type: string): boolean; static initialize(target: Object): void; - off(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - off(type: string, listener: Object, useCapture?: boolean): void; - on(type: string, listener: (eventObj: Object) => any, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; - on(type: string, listener: Object, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; + on(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + on(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; removeAllEventListeners(type?: string): void; - removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - removeEventListener(type: string, listener: Object, useCapture?: boolean): void; + removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; toString(): string; } - export function indexOf(array: Array, searchElement: Object): number; - export function proxy(method: Function, scope: Object, ...arg: any[]): Function; + export function indexOf(array: any[], searchElement: Object): number; + + export function proxy(method: (eventObj: Object) => boolean, scope: Object, ...arg: any[]): (eventObj: Object) => any; + export function proxy(method: (eventObj: Object) => void, scope: Object, ...arg: any[]): (eventObj: Object) => any; + export function proxy(method: { handleEvent: (eventObj: Object) => boolean; }, scope: Object, ...arg: any[]): (eventObj: Object) => any; + export function proxy(method: { handleEvent: (eventObj: Object) => void; }, scope: Object, ...arg: any[]): (eventObj: Object) => any; } diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts index 7f946b9da..6c083da5c 100644 --- a/easeljs/easeljs-tests.ts +++ b/easeljs/easeljs-tests.ts @@ -4,16 +4,16 @@ var stage: any; var myContext2D: any; function test_simple() { - var canvas: HTMLCanvasElement = document.getElementById('canvas'); - var stage: createjs.Stage = new createjs.Stage(canvas); - var shape: createjs.Shape = new createjs.Shape(); + var canvas = document.getElementById('canvas'); + var stage = new createjs.Stage(canvas); + var shape = new createjs.Shape(); shape.graphics.beginFill('rgba(255,0,0,1)').drawRoundRect(0, 0, 120, 120, 10); stage.addChild(shape); stage.update(); } function test_animation() { - var ss: createjs.SpriteSheet = new createjs.SpriteSheet({ + var ss = new createjs.SpriteSheet({ "frames": { "width": 200, "numFrames": 64, @@ -29,7 +29,7 @@ function test_animation() { ss.getAnimation("run").next = "jump"; ss.getAnimation("jump").next = "run"; - var sprite: createjs.Sprite = new createjs.Sprite(ss); + var sprite = new createjs.Sprite(ss); sprite.scaleY = sprite.scaleX = .4; sprite.gotoAndPlay("run"); @@ -40,12 +40,12 @@ function test_animation() { } function test_graphics() { - var g: createjs.Graphics = new createjs.Graphics(); + var g = new createjs.Graphics(); g.setStrokeStyle(1); g.beginStroke(createjs.Graphics.getRGB(0, 0, 0)); g.beginFill(createjs.Graphics.getRGB(255, 0, 0)); g.drawCircle(0, 0, 3); - var s: createjs.Shape = new createjs.Shape(g); + var s = new createjs.Shape(g); s.x = 100; s.y = 100; stage.addChild(s); diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index d72dfa14c..efbdad8f3 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -1,6 +1,6 @@ // Type definitions for EaselJS 0.7.0 // Project: http://www.createjs.com/#!/EaselJS -// Definitions by: Pedro Ferreira +// Definitions by: Pedro Ferreira , Chris Smith // Definitions: https://github.com/borisyankov/DefinitelyTyped /* @@ -16,7 +16,7 @@ /// // rename the native MouseEvent, to avoid conflit with createjs's MouseEvent -interface HtmlMouseEvent extends MouseEvent { +interface NativeMouseEvent extends MouseEvent { } @@ -39,7 +39,6 @@ declare module createjs { mask: any; // Image or HTMLCanvasElement // methods - applyFilter(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, targetCtx?: CanvasRenderingContext2D, targetX?: number, targetY?: number): boolean clone(): AlphaMaskFilter; } @@ -52,42 +51,16 @@ declare module createjs { // properties image: any; // Image or HTMLCanvasElement or HTMLVideoElement - snapToPixel: boolean; sourceRect: Rectangle; // methods - cache(): void; clone(): Bitmap; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; - isVisible(): boolean; - toString(): string; - uncache(): void; - updateCache(): void; } - export class BitmapAnimation extends DisplayObject { // deprecated - constructor(spriteSheet: SpriteSheet); - - // properties - currentAnimation: string; - currentAnimationFrame: number; - currentFrame: number; - offset: number; - onAnimationEnd: any; - paused: boolean; - spriteSheet: SpriteSheet; - - // methods - advance(): void ; - clone(): BitmapAnimation; - gotoAndPlay(frameOrAnimation: string): void; - gotoAndPlay(frameOrAnimation: number): void; - gotoAndStop(frameOrAnimation: string): void; - gotoAndStop(frameOrAnimation: number): void; - play(): void; - stop(): void; - toString(): string; - + /** + * @deprecated renamed to Sprite, here for backwards compatibility + */ + export class BitmapAnimation extends Sprite { } export class BitmapText extends DisplayObject { @@ -100,24 +73,6 @@ declare module createjs { spriteSheet: SpriteSheet; text: string; - // methods - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; - isVisible(): boolean; - toString(): string; - - // events - /* - click: (event: Object) => any; - dblclick: (event: Object) => any; - mousedown: (event: Object) => any; - mouseout: (event: Object) => any; - mouseover: (event: Object) => any; - pressmove: (event: Object) => any; - pressup: (event: Object) => any; - rollout: (event: Object) => any; - rollover: (event: Object) => any; - tick: (event: Object) => any; - */ } export class BlurFilter extends Filter { @@ -135,14 +90,13 @@ declare module createjs { export class ButtonHelper { constructor(target: Sprite, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string); constructor(target: MovieClip, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string); - constructor(target: BitmapAnimation, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string); // properties downLabel: any; // String or Number outLabel: any; // String or Number overLabel: any; // String or Number play: boolean; - target: DisplayObject; // MovieClip or Sprite (or BitmapAnimation) + target: DisplayObject; // MovieClip or Sprite // methods setEnabled(value: boolean): void; @@ -221,6 +175,9 @@ declare module createjs { } export class Command { + // methods + constructor(f: any, params: any, path: any); + exec(scope: any): void; } export class Container extends DisplayObject { @@ -232,18 +189,16 @@ declare module createjs { // methods addChild(...child: DisplayObject[]): DisplayObject; + addChildAt(child: DisplayObject, index: number): DisplayObject; // add this for the common case addChildAt(...childOrIndex: any[]): DisplayObject; // actually (...child: DisplayObject[], index: number) clone(recursive?: boolean): Container; contains(child: DisplayObject): boolean; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getChildAt(index: number): DisplayObject; getChildByName(name: string): DisplayObject; getChildIndex(child: DisplayObject): number; getNumChildren(): number; getObjectsUnderPoint(x: number, y: number): DisplayObject[]; getObjectUnderPoint(x: number, y: number): DisplayObject; - hitTest(x: number, y: number): boolean; - isVisible(): boolean; removeAllChildren(): void; removeChild(...child: DisplayObject[]): boolean; removeChildAt(...index: number[]): boolean; @@ -251,21 +206,6 @@ declare module createjs { sortChildren(sortFunction: (a: DisplayObject, b: DisplayObject) => number): void; swapChildren(child1: DisplayObject, child2: DisplayObject): void; swapChildrenAt(index1: number, index2: number): void; - toString(): string; - - // events - /* - click: (event: Object) => any; - dblclick: (event: Object) => any; - mousedown: (event: Object) => any; - mouseout: (event: Object) => any; - mouseover: (event: Object) => any; - pressmove: (event: Object) => any; - pressup: (event: Object) => any; - rollout: (event: Object) => any; - rollover: (event: Object) => any; - tick: (event: Object) => any; - */ } export class DisplayObject extends EventDispatcher { @@ -283,12 +223,6 @@ declare module createjs { mask: Shape; mouseEnabled: boolean; name: string; - onClick: Function; // deprecated - onDoubleClick: Function; // deprecated - onMouseOut: Function; // deprecated - onMouseOver: Function; // deprecated - onPress: Function; // deprecated - onTick: Function; parent: Container; regX: number; regY: number; @@ -298,7 +232,10 @@ declare module createjs { shadow: Shadow; skewX: number; skewY: number; - snapToPixel: boolean; // deprecated + /** + * @deprecated + */ + snapToPixel: boolean; static suppressCrossDomainErrors: boolean; visible: boolean; x: number; @@ -322,24 +259,10 @@ declare module createjs { set(props: Object): DisplayObject; setBounds(x: number, y: number, width: number, height: number): void; setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, regX?: number, regY?: number): DisplayObject; - toString(): string; uncache(): void; updateCache(compositeOperation?: string): void; updateContext(ctx: CanvasRenderingContext2D): void; - // events - /* - click: (event: MouseEvent) => any; - dblClick: (event: MouseEvent) => any; - mousedown: (event: MouseEvent) => any; - mouseout: (event: MouseEvent) => any; - mouseover: (event: MouseEvent) => any; - pressmove: (event: MouseEvent) => any; - pressup: (event: MouseEvent) => any; - rollout: (event: MouseEvent) => any; - rollover: (event: MouseEvent) => any; - tick: () => any; - */ } export class DOMElement extends DisplayObject { @@ -349,31 +272,8 @@ declare module createjs { htmlElement: HTMLElement; // methods - cache(): void; // not applicable clone(): DisplayObject; // throw error - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; - globalToLocal(): Point; // throw error - hitTest(): boolean; // not applicable - isVisible(): boolean; - localToGlobal(): Point; // not applicable - localToLocal(): Point; // not applicable - toString(): string; - uncache(): void; // not applicable - updateCache(): void; // not applicable - // events - /* - click: (event: MouseEvent) => any; - dblClick: (event: MouseEvent) => any; - mousedown: (event: MouseEvent) => any; - mouseout: (event: MouseEvent) => any; - mouseover: (event: MouseEvent) => any; - pressmove: (event: MouseEvent) => any; - pressup: (event: MouseEvent) => any; - rollout: (event: MouseEvent) => any; - rollover: (event: MouseEvent) => any; - tick: () => any; - */ } @@ -444,7 +344,7 @@ declare module createjs { toString(): string; - // tinyAPI + // tiny API - short forms of methods above a(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise: boolean): Graphics; at(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics; bf(image: Object, repetition?: string, matrix?: Matrix2D): Graphics; @@ -521,12 +421,10 @@ declare module createjs { export class MouseEvent extends Event { - constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: HtmlMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number); + constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number); // properties - nativeEvent: HtmlMouseEvent; - onMouseMove: Function; // deprecated - onMouseUp: Function; // deprecated + nativeEvent: NativeMouseEvent; pointerID: number; primary: boolean; rawX: number; @@ -534,17 +432,32 @@ declare module createjs { stageX: number; stageY: number; target: DisplayObject; - type: string; // methods clone(): MouseEvent; - toString(): string; - // events - /* - mousemove: (event: MouseEvent) => any; // deprecated - mouseup: (event: MouseEvent) => any; // deprecated - */ + // EventDispatcher mixins + addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; + on(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + on(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; + removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; + off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; + removeAllEventListeners(type?: string): void; + dispatchEvent(eventObj: string, target?: Object): boolean; + dispatchEvent(eventObj: Object, target?: Object): boolean; + dispatchEvent(eventObj: Event, target?: Object): boolean; + hasEventListener(type: string): boolean; } @@ -568,16 +481,13 @@ declare module createjs { static version: string; // methods - clone(recursive?: boolean): Container; // throw error - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; + clone(): MovieClip; // not supported getCurrentLabel(): string; getLabels(): Object[]; gotoAndPlay(positionOrLabel: string): void; gotoAndPlay(positionOrLabel: number): void; gotoAndStop(positionOrLabel: string): void; gotoAndStop(positionOrLabel: number): void; - hitTest(x: number, y: number): boolean; - isVisible(): boolean; play(): void; stop(): void; } @@ -599,7 +509,7 @@ declare module createjs { // methods clone(): Point; copy(point: Point): Point; - initialize (x: number, y: number): Point; + initialize (x?: number, y?: number): Point; toString(): string; } @@ -656,61 +566,54 @@ declare module createjs { currentAnimationFrame: number; currentFrame: number; framerate: number; - offset: number; // deprecated - onAnimationEnd: Function; // deprecated + /** + * @deprecated + */ + offset: number; paused: boolean; spriteSheet: SpriteSheet; // methods advance(time?: number): void; - cache(): void; clone(): Sprite; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getBounds(): Rectangle; gotoAndPlay(frameOrAnimation: string): void; + gotoAndPlay(frameOrAnimation: number): void; + gotoAndStop(frameOrAnimation: string): void; gotoAndStop(frameOrAnimation: number): void; - isVisible(): boolean; play(): void; stop(): void; - toString(): string; - uncache(): void; - updateCache(): void; - // events - /* - animationend: () => any; - */ } - // what is returned from .getAnimation() - interface SpriteSheetAnimationProp { + // what is returned from SpriteSheet.getAnimation(string) + interface SpriteSheetAnimation { frames: number[]; speed: number; name: string; next: string; } + // what is returned from SpriteSheet.getFrame(number) + interface SpriteSheetFrame { + image: HTMLImageElement; + rect: Rectangle; + } + export class SpriteSheet extends EventDispatcher { constructor(data: Object); // properties complete: boolean; framerate: number; - onComplete: Function; // deprecated // methods clone(): SpriteSheet; - getAnimation(name: string): SpriteSheetAnimationProp; + getAnimation(name: string): SpriteSheetAnimation; getAnimations(): string[]; - getFrame(frameIndex: number): Object; + getFrame(frameIndex: number): SpriteSheetFrame; getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle; getNumFrames(animation: string): number; - toString(): string; - - // events - /* - complete : () => any; - */ } @@ -718,8 +621,6 @@ declare module createjs { // properties maxHeight: number; maxWidth: number; - onComplete: Function; // deprecated - onProgress: Function; // deprecated padding: number; progress: number; scale: number; @@ -736,17 +637,18 @@ declare module createjs { stopAsync(): void; toString(): string; - // events - /* - complete: (event: Object) => any; - progress: (event: Object) => any; - */ } export class SpriteSheetUtils { + /** + * @deprecated + */ static addFlippedFrames(spriteSheet: SpriteSheet, horizontal?: boolean, vertical?: boolean, both?: boolean): void; // deprecated static extractFrame(spriteSheet: SpriteSheet, frameOrAnimation : number): HTMLImageElement; - static extractFrame(spriteSheet: SpriteSheet, frameOrAnimation : string): HTMLImageElement; + static extractFrame(spriteSheet: SpriteSheet, frameOrAnimation: string): HTMLImageElement; + /** + * @deprecated + */ static mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; // deprecated } @@ -757,43 +659,27 @@ declare module createjs { // properties autoClear: boolean; - canvas: any; - handleEvent: Function; - hitArea: DisplayObject; + canvas: HTMLCanvasElement; mouseInBounds: boolean; mouseMoveOutside: boolean; mouseX: number; mouseY: number; nextStage: Stage; - onMouseDown: Function; // deprecated - onMouseMove: Function; // deprecated - onMouseUp: Function; // deprecated + /** + * @deprecated + */ snapToPixelEnabled: boolean; // deprecated tickOnUpdate: boolean; // methods clear(): void; clone(): Stage; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; enableDOMEvents(enable?: boolean): void; enableMouseOver(frequency?: number): void; - hitTest(x: number, y: number): boolean; - isVisible(): boolean; + handleEvent(evt: Object): void; toDataURL(backgroundColor: string, mimeType: string): string; update(...arg: any[]): void; - // events - /* - drawend: (event: MouseEvent) => any; - drawstart: (event: MouseEvent) => any; - mouseenter: (event: MouseEvent) => any; - mouseleave: (event: MouseEvent) => any; - stagemousedown: (event: MouseEvent) => any; - stagemousemove: (event: MouseEvent) => any; - stagemouseup: (event: MouseEvent) => any; - tickend: (event: MouseEvent) => any; - tickstart: (event: MouseEvent) => any; - */ } @@ -813,21 +699,22 @@ declare module createjs { // methods clone(): Text; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getMeasuredHeight(): number; getMeasuredLineHeight(): number; getMeasuredWidth(): number; - isVisible(): boolean; } - export class Ticker extends EventDispatcher { + export class Ticker { // properties static maxDelta: number; static RAF: string; static RAF_SYNCHED: string; static TIMEOUT: string; static timingMode: string; - static useRAF: boolean; // deprecated + /** + * @deprecated + */ + static useRAF: boolean; // methods static getEventTime(runTime?: boolean): number; @@ -843,26 +730,41 @@ declare module createjs { static setFPS(value: number): void; static setInterval(interval: number): void; static setPaused(value: boolean): void; + static toString(): string; // EventDispatcher mixins - static addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; - static addEventListener(type: string, listener: Object, useCapture?: boolean): any; + static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; static dispatchEvent(eventObj: Object, target?: Object): boolean; static dispatchEvent(eventObj: string, target?: Object): boolean; static dispatchEvent(eventObj: Event, target?: Object): boolean; static hasEventListener(type: string): boolean; - static off(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - static off(type: string, listener: Object, useCapture?: boolean): void; - static on(type: string, listener: (eventObj: Object) => any, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; - static on(type: string, listener: Object, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; + static on(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + static on(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; static removeAllEventListeners(type?: string): void; - static removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; + static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; - // events - /* - tick: (timeElapsed: number) => any; - */ + } + + export class TickerEvent { + // properties + target: Object; + type: string; + paused: boolean; + delta: number; + time: number; + runTime: number; } export class Touch { diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 21ace1154..418103b54 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -19,10 +19,6 @@ declare module createjs { // properties canceled: boolean; loaded: boolean; - onComplete: Function; // deprecated - onError: Function; // deprecated - onLoadStart: Function; // deprecated - onProgress: Function; // deprecated progress: number; // methods @@ -31,13 +27,6 @@ declare module createjs { load(): void; toString(): string; - // events - /* - complete: (event: Object) => any; - error: (event: Object) => any; - loadStart: (event: Object) => any; - progress: (event: Object) => any; - */ } export class LoadQueue extends AbstractLoader { @@ -53,8 +42,6 @@ declare module createjs { static LOAD_TIMEOUT: number; maintainScriptOrder: boolean; next: LoadQueue; - onFileLoad: Function; // deprecated - onFileProgress: Function; // deprecated static SOUND: string; stopOnError: boolean; static SVG: string; @@ -77,14 +64,6 @@ declare module createjs { setMaxConnections(value: number): void; setPaused(value: boolean): void; setUseXHR(value: boolean): void; - toString(): string; - - // events - /* - fileload: (event: Object) => any; - fileprogress: (event: Object) => any; - filestart: (event: Object) => any; - */ } export class PreloadJS { @@ -100,7 +79,6 @@ declare module createjs { // methods getResult(): any; - toString(): string; } export class XHRLoader extends AbstractLoader { @@ -110,6 +88,5 @@ declare module createjs { getAllResponseHeaders(): string; getResponseHeader(header: string): string; getResult (rawResult?: boolean): Object; - toString(): string; } } diff --git a/soundjs/soundjs-tests.ts b/soundjs/soundjs-tests.ts index 39a0581b5..1d97d18d7 100644 --- a/soundjs/soundjs-tests.ts +++ b/soundjs/soundjs-tests.ts @@ -7,7 +7,7 @@ createjs.Sound.addEventListener("fileload", createjs.proxy(this.loadHandler, thi createjs.Sound.registerSound("path/to/mySound.mp3|path/to/mySound.ogg", "sound"); function loadHandler(event:Object):void { // This is fired for each sound that is registered. - var instance: createjs.SoundInstance = createjs.Sound.play("sound"); // play using id. Could also use full sourcepath or event.src. + var instance = createjs.Sound.play("sound"); // play using id. Could also use full sourcepath or event.src. instance.addEventListener("complete", createjs.proxy(this.handleComplete, this)); instance.setVolume(0.5); } \ No newline at end of file diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index d5836d3ef..d51100279 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -46,6 +46,7 @@ declare module createjs { setVolume(value: number): boolean; unregisterPreloadInstance(flashId: string): void; unregisterSoundInstance(flashId: string, instance: any): void; + toString(): string; } export class HTMLAudioPlugin { @@ -72,7 +73,7 @@ declare module createjs { toString(): string; } - export class Sound extends EventDispatcher { + export class Sound { // properties static activePlugin: Object; static defaultInterruptBehavior: string; @@ -82,7 +83,6 @@ declare module createjs { static INTERRUPT_EARLY: string; static INTERRUPT_LATE: string; static INTERRUPT_NONE: string; - static onLoadComplete: Function; // deprecated static PLAY_FAILED: string; static PLAY_FINISHED: string; static PLAY_INITED: string; @@ -100,7 +100,6 @@ declare module createjs { static initializeDefaultPlugins(): boolean; static isReady(): boolean; static loadComplete(src: string): boolean; - static mute(value: boolean): void; // deprecated static play(src: string, interrupt?: any, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): SoundInstance; static registerManifest(manifest: any[], basePath: string): Object; static registerPlugin(plugin: Object): boolean; @@ -116,25 +115,28 @@ declare module createjs { static stop(): void; static toString(): string; - // events - /* - fileload: () => any; - */ - // EventDispatcher mixins - static addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; - static addEventListener(type: string, listener: Object, useCapture?: boolean): any; + static addEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + static addEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + static addEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; static dispatchEvent(eventObj: Object, target?: Object): boolean; static dispatchEvent(eventObj: string, target?: Object): boolean; static dispatchEvent(eventObj: Event, target?: Object): boolean; static hasEventListener(type: string): boolean; - static off(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - static off(type: string, listener: Object, useCapture?: boolean): void; - static on(type: string, listener: (eventObj: Object) => any, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; - static on(type: string, listener: Object, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + static off(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + static off(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + static off(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + static off(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; + static on(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): Function; + static on(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): Function; + static on(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): Object; + static on(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): Object; static removeAllEventListeners(type?: string): void; - static removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; - static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; + static removeEventListener(type: string, listener: (eventObj: Object) => boolean, useCapture?: boolean): void; + static removeEventListener(type: string, listener: (eventObj: Object) => void, useCapture?: boolean): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => boolean; }, useCapture?: boolean): void; + static removeEventListener(type: string, listener: { handleEvent: (eventObj: Object) => void; }, useCapture?: boolean): void; } @@ -143,12 +145,6 @@ declare module createjs { // properties gainNode: any; - onComplete: Function; // deprecated - onLoop: Function; // deprecated - onPlayFailed: Function; // deprecated - onPlayInterrupted: Function; // deprecated - onPlaySucceeded: Function; // deprecated - onReady: Function; // deprecated pan: number; panNode: any; playState: string; @@ -162,7 +158,6 @@ declare module createjs { getPan(): number; getPosition(): number; getVolume(): number; - mute(value: boolean): boolean // deprecated pause(): boolean; play(interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): void; play(interrupt?: Object, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): void; @@ -172,17 +167,7 @@ declare module createjs { setPosition(value: number): void; setVolume(value: number): boolean; stop(): boolean; - toString(): string; - // events - /* - complete: () => any; - failed: () => any; - interrupted: () => any; - loop: () => any; - ready: () => any; - succeeded: () => any; - */ } export class SoundJS { @@ -208,9 +193,13 @@ declare module createjs { playEmptySound(): void; register(src: string, instances: number): Object; removeAllSounds(src: string): void; + /** + * @deprecated + */ removeFromPreload(src: string): void; removeSound(src: string): void; setMute(value: boolean): boolean; setVolume(value: number): boolean; + toString(): string; } } diff --git a/tweenjs/tweenjs-tests.ts b/tweenjs/tweenjs-tests.ts index 5cb3b79c6..080c6c954 100644 --- a/tweenjs/tweenjs-tests.ts +++ b/tweenjs/tweenjs-tests.ts @@ -1,7 +1,7 @@ /// /// -var target: createjs.DisplayObject = new createjs.DisplayObject(); +var target = new createjs.DisplayObject(); // source : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html // Chainable modules : diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts index a1e622c5a..d7896d349 100644 --- a/tweenjs/tweenjs.d.ts +++ b/tweenjs/tweenjs.d.ts @@ -1,6 +1,6 @@ // Type definitions for TweenJS 0.5.0 // Project: http://www.createjs.com/#!/TweenJS -// Definitions by: Pedro Ferreira +// Definitions by: Pedro Ferreira , Chris Smith // Definitions: https://github.com/borisyankov/DefinitelyTyped /* @@ -27,45 +27,45 @@ declare module createjs { export class Ease { // methods - static backIn(t: number): number; - static backInOut(t: number): number; - static backOut(t: number): number; - static bounceIn(t: number): number; - static bounceInOut(t: number): number; - static bounceOut(t: number): number; - static circIn(t: number): number; - static circInOut(t: number): number; - static circOut(t: number): number; - static cubicIn(t: number): number; - static cubicInOut(t: number): number; - static cubicOut(t: number): number; - static elasticIn(t: number): number; - static elasticInOut(t: number): number; - static elasticOut(t: number): number; - static get(amount: number): (t: number) => number; - static getBackIn(amount: number): (t: number) => number; - static getBackInOut(amount: number): (t: number) => number; - static getBackOut(amount: number): (t: number) => number; - static getElasticIn(amplitude: number, period: number): (t: number) => number; - static getElasticInOut(amplitude: number, period: number): (t: number) => number; - static getElasticOut(amplitude: number, period: number): (t: number) => number; - static getPowIn(pow: number): (t: number) => number; - static getPowInOut(pow: number): (t: number) => number; - static getPowOut(pow: number): (t: number) => number; - static linear(t: number): number; - static none(t: number): number; // same as linear - static quadIn(t: number): number; - static quadInOut(t: number): number; - static quadOut(t: number): number; - static quartIn(t: number): number; - static quartInOut(t: number): number; - static quartOut(t: number): number; - static quintIn(t: number): number; - static quintInOut(t: number): number; - static quintOut(t: number): number; - static sineIn(t: number): number; - static sineInOut(t: number): number; - static sineOut(t: number): number; + static backIn: (amount: number) => number; + static backInOut: (amount: number) => number; + static backOut: (amount: number) => number; + static bounceIn: (amount: number) => number; + static bounceInOut: (amount: number) => number; + static bounceOut: (amount: number) => number; + static circIn: (amount: number) => number; + static circInOut: (amount: number) => number; + static circOut: (amount: number) => number; + static cubicIn: (amount: number) => number; + static cubicInOut: (amount: number) => number; + static cubicOut: (amount: number) => number; + static elasticIn: (amount: number) => number; + static elasticInOut: (amount: number) => number; + static elasticOut: (amount: number) => number; + static get(amount: number): (amount: number) => number; + static getBackIn(amount: number): (amount: number) => number; + static getBackInOut(amount: number): (amount: number) => number; + static getBackOut(amount: number): (amount: number) => number; + static getElasticIn(amplitude: number, period: number): (amount: number) => number; + static getElasticInOut(amplitude: number, period: number): (amount: number) => number; + static getElasticOut(amplitude: number, period: number): (amount: number) => number; + static getPowIn(pow: number): (amount: number) => number; + static getPowInOut(pow: number): (amount: number) => number; + static getPowOut(pow: number): (amount: number) => number; + static linear: (amount: number) => number; + static none: (amount: number) => number; // same as linear + static quadIn: (amount: number) => number; + static quadInOut: (amount: number) => number; + static quadOut: (amount: number) => number; + static quartIn: (amount: number) => number; + static quartInOut: (amount: number) => number; + static quartOut: (amount: number) => number; + static quintIn: (amount: number) => number; + static quintInOut: (amount: number) => number; + static quintOut: (amount: number) => number; + static sineIn: (amount: number) => number; + static sineInOut: (amount: number) => number; + static sineOut: (amount: number) => number; } export class MotionGuidePlugin { @@ -95,7 +95,6 @@ declare module createjs { duration: number; ignoreGlobalPause: boolean; loop: boolean; - onChange: Function; // deprecated position: Object; // methods @@ -114,13 +113,7 @@ declare module createjs { setPaused(value: boolean): void; setPosition(value: number, actionsMode?: number): boolean; tick(delta: number): void; - toString(): string; updateDuration(): void; - - // events - /* - change: (instance: Timeline) => any; - */ } @@ -137,12 +130,13 @@ declare module createjs { onChange: Function; // deprecated passive: boolean; pluginData: Object; - position: Object; + position: number; static REVERSE: number; target: Object; // methods - call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; + call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween; // when 'params' isn't given, the callback receives a tweenObject + call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween; static hasActiveTweens(target?: Object): boolean; static installPlugin(plugin: Object, properties: any[]): void; @@ -156,13 +150,8 @@ declare module createjs { static tick(delta: number, paused: boolean): void; tick(delta: number): void; to(props: Object, duration?: number, ease?: (t: number) => number): Tween; - toString(): string; wait(duration: number, passive?: boolean): Tween; - // events - /* - change: (event: any) => any; - */ } export class TweenJS {