From 8ba6fb3237f148dcac040364956ebb92a5c435c0 Mon Sep 17 00:00:00 2001 From: s_kimura Date: Wed, 27 Nov 2013 14:48:35 +0900 Subject: [PATCH 1/5] Updated EaselJS definitions to v0.7.0 and TweenJS, SoundJS definitions to v0.5,0 and PreloadJS definitions to v0.4.0 --- createjs/createjs.d.ts | 87 +++ easeljs/easeljs-tests.ts | 1 + easeljs/easeljs.d.ts | 963 ++++++++++++++++------------- preloadjs/preloadjs.d.ts | 118 ++-- soundjs/soundjs-tests.ts.tscparams | 1 - soundjs/soundjs.d.ts | 350 +++++------ soundjs/soundjs.d.ts.tscparams | 1 - tweenjs/tweenjs-tests.ts.tscparams | 1 - tweenjs/tweenjs.d.ts | 215 +++---- 9 files changed, 958 insertions(+), 779 deletions(-) create mode 100644 createjs/createjs.d.ts delete mode 100644 soundjs/soundjs-tests.ts.tscparams delete mode 100644 soundjs/soundjs.d.ts.tscparams delete mode 100644 tweenjs/tweenjs-tests.ts.tscparams diff --git a/createjs/createjs.d.ts b/createjs/createjs.d.ts new file mode 100644 index 000000000..9e66e79ee --- /dev/null +++ b/createjs/createjs.d.ts @@ -0,0 +1,87 @@ +// Type definitions for EaselJS 0.7.0, TweenJS 0.5.0, SoundJS 0.5.0, PreloadJS 0.4.0 +// Project: http://www.createjs.com/#!/EaselJS +// Definitions by: Pedro Ferreira +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/* + Copyright (c) 2012 Pedro Ferreira + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ +// Common class and methods for CreateJS. +// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html +// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html +// Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html +// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html + + +declare module createjs { + export class Event { + constructor(type: string, bubbles: boolean, cancelable: boolean); + + // properties + bubbles: boolean; + cancelable: boolean; + currentTarget: Object; + defaultPrevented: boolean; + eventPhase: number; + immediatePropagationStopped: boolean; + propagationStopped: boolean; + removed: boolean; + target: Object; + timeStamp: number; + type: string; + + // other event payloads + data: any; + delta: number; + error: string; + id: string; + item: any; + loaded: number; + name: string; + next: string; + params: any[]; + paused: boolean; + progress: number; + rawResult: Object; + result: Object; + runTime: number; + src: string; + time: number; + total: number; + + // methods + clone(): Event; + preventDefault(): void; + remove(): void; + stopImmediatePropagation(): void; + stopPropagation(): void; + toString(): string; + } + + export class EventDispatcher { + constructor(); + + // methods + addEventListener(type: string, listener: Function, useCapture?: boolean): any; + addEventListener(type: string, listener: Object, useCapture?: boolean): any; + 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: Function, useCapture?: boolean): void; + off(type: string, listener: Object, useCapture?: boolean): void; + on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; + on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + removeAllEventListeners(type?: string): void; + removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + removeEventListener(type: string, listener: Object, useCapture?: boolean): void; + toString(): string; + } + + export function indexOf(array: Array, searchElement: Object): number; + export function proxy(method: Function, scope: Object, ...arg: any[]): Function; +} diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts index 6c083da5c..268e7381e 100644 --- a/easeljs/easeljs-tests.ts +++ b/easeljs/easeljs-tests.ts @@ -10,6 +10,7 @@ function test_simple() { shape.graphics.beginFill('rgba(255,0,0,1)').drawRoundRect(0, 0, 120, 120, 10); stage.addChild(shape); stage.update(); + } function test_animation() { diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index d0bbbbdca..cdc798f63 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -1,6 +1,6 @@ -// Type definitions for EaselJS 0.7 +// Type definitions for EaselJS 0.7.0 // Project: http://www.createjs.com/#!/EaselJS -// Definitions by: Pedro Ferreira , Chris Smith +// Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped /* @@ -10,21 +10,270 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +// Library documentation : http://www.createjs.com/Docs/EaselJS/modules/EaselJS.html +/// /// -// rename the native MouseEvent, to avoid conflict with createjs's MouseEvent -interface NativeMouseEvent extends MouseEvent { +// rename the native MouseEvent, to avoid conflit with createjs's MouseEvent +interface HtmlMouseEvent extends MouseEvent { } declare module createjs { - // :: base classes :: // + export class AlphaMapFilter extends Filter { + constructor(alphaMap: HTMLImageElement); + constructor(alphaMap: HTMLCanvasElement); + // properties + alphaMap: any; //Image or HTMLCanvasElement + // methods + clone(): AlphaMapFilter; + } + + export class AlphaMaskFilter extends Filter { + constructor(mask: HTMLImageElement); + constructor(mask: HTMLCanvasElement); + + // properties + 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; + } + + + export class Bitmap extends DisplayObject { + constructor(imageOrUrl: HTMLImageElement); + constructor(imageOrUrl: HTMLCanvasElement); + constructor(imageOrUrl: HTMLVideoElement); + constructor(imageOrUrl: string); + + // 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; + + } + + export class BitmapText extends DisplayObject { + constructor(text?:string, spriteSheet?:SpriteSheet); + + // properties + letterSpacing: number; + lineHeight: number; + spaceWidth: number; + 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 { + constructor(blurX?: number, blurY?: number, quality?: number); + + // properties + blurX: number; + blurY: number; + quality: number; + + // methods + clone(): BlurFilter; + } + + 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) + + // methods + setEnabled(value: boolean): void; + toString(): string; + } + + export class ColorFilter extends Filter { + constructor(redMultiplier?: number, greenMultiplier?: number, blueMultiplier?: number, alphaMultiplier?: number, redOffset?: number, greenOffset?: number, blueOffset?: number, alphaOffset?: number); + + // properties + alphaMultiplier: number; + alphaOffset: number; + blueMultiplier: number; + blueOffset: number; + greenMultiplier: number; + greenOffset: number; + redMultiplier: number; + redOffset: number; + + // methods + clone(): ColorFilter; + } + + export class ColorMatrix implements Array { + constructor(brightness: number, contrast: number, saturation: number, hue: number); + + static DELTA_INDEX: number[]; + static IDENTITY_MATRIX: number[]; + static LENGTH: number; + + // methods + adjustBrightness(value: number): ColorMatrix; + adjustColor(brightness: number, contrast: number, saturation: number, hue: number): ColorMatrix; + adjustContrast(value: number): ColorMatrix; + adjustHue(value: number): ColorMatrix; + adjustSaturation(value: number): ColorMatrix; + clone(): ColorMatrix; + concat(...matrix: number[]): ColorMatrix; + copyMatrix(...matrix: ColorMatrix[]): ColorMatrix; + reset(): ColorMatrix; + toArray(): number[]; + + // implements Array interface start + concat(...items: ColorMatrix[]): number[]; + join(separator?: string): string; + pop(): number; + push(...items: number[]): number; + reverse(): number[]; + shift(): number; + slice(start: number, end?: number): number[]; + sort(compareFn?: (a: number, b: number) => number): number[]; + splice(start: number): number[]; + unshift(...items: number[]): number; + indexOf(searchElement: number, fromIndex?: number): number; + + lastIndexOf(searchElement: number, fromIndex?: number): number; + every(callbackfn: (value: number, index: number, array: number[]) => boolean, thisArg?: any): boolean; + some(callbackfn: (value: number, index: number, array: number[]) => boolean, thisArg?: any): boolean; + forEach(callbackfn: (value: number, index: number, array: number[]) => void, thisArg?: any): void; + map(callbackfn: (value: number, index: number, array: number[]) => ColorMatrix, thisArg?: any): ColorMatrix[]; + + filter(callbackfn: (value: number, index: number, array: number[]) => boolean, thisArg?: any): number[]; + reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number, initialValue?: number): number; + reduce(callbackfn: (previousValue: ColorMatrix, currentValue: number, currentIndex: number, array: number[]) => ColorMatrix, initialValue: ColorMatrix): ColorMatrix; + reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: number[]) => number, initialValue?: number): number; + reduceRight(callbackfn: (previousValue: ColorMatrix, currentValue: number, currentIndex: number, array: number[]) => ColorMatrix, initialValue: ColorMatrix): ColorMatrix; + length: number; + // implements Array interface end + } + + export class ColorMatrixFilter extends Filter { + constructor(matrix: number[]); + + // methods + clone(): ColorMatrixFilter; + } + + export class Command { + } + + export class Container extends DisplayObject { + constructor(); + + // properties + children: DisplayObject[]; + mouseChildren: boolean; + + // methods + addChild(...child: DisplayObject[]): DisplayObject; + 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; + setChildIndex(child: DisplayObject, index: number): void; + 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 { + constructor(); + // properties alpha: number; - cacheCanvas: HTMLCanvasElement; + cacheCanvas: HTMLCanvasElement; // HTMLCanvasElement or Object cacheID: number; compositeOperation: string; cursor: string; @@ -34,7 +283,13 @@ declare module createjs { mask: Shape; mouseEnabled: boolean; name: string; - parent: DisplayObject; + onClick: Function; // deprecated + onDoubleClick: Function; // deprecated + onMouseOut: Function; // deprecated + onMouseOver: Function; // deprecated + onPress: Function; // deprecated + onTick: Function; + parent: Container; regX: number; regY: number; rotation: number; @@ -43,10 +298,7 @@ declare module createjs { shadow: Shadow; skewX: number; skewY: number; - /** - * @deprecated - */ - snapToPixel: boolean; + snapToPixel: boolean; // deprecated static suppressCrossDomainErrors: boolean; visible: boolean; x: number; @@ -55,7 +307,7 @@ declare module createjs { // methods cache(x: number, y: number, width: number, height: number, scale?: number): void; clone(): DisplayObject; - draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): void; + draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getBounds(): Rectangle; getCacheDataURL(): string; getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D; @@ -70,289 +322,83 @@ 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; + 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 { + constructor(htmlElement: HTMLElement); + + // properties + 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; + */ } + export class EaselJS { + // properties + static buildDate: string; + static version: string; + } + export class Filter { - constructor (); + constructor(); + + // methods applyFilter(ctx: CanvasRenderingContext2D, x: number, y: number, width: number, height: number, targetCtx?: CanvasRenderingContext2D, targetX?: number, targetY?: number): boolean; clone(): Filter; getBounds(): Rectangle; toString(): string; } - - // :: The rest :: // - - export class AlphaMapFilter extends Filter { - // properties - alphaMap: any; //Image or HTMLCanvasElement - - // methods - constructor (alphaMap: HTMLImageElement); - constructor (alphaMap: HTMLCanvasElement); - clone(): AlphaMapFilter; - } - - - export class AlphaMaskFilter extends Filter { - // properties - mask: any; // HTMLImageElement or HTMLCanvasElement - - // methods - constructor (mask: HTMLImageElement); - constructor (mask: HTMLCanvasElement); - clone(): AlphaMaskFilter; - } - - - export class Bitmap extends DisplayObject { - // properties - image: any; // HTMLImageElement or HTMLCanvasElement or HTMLVideoElement - sourceRect: Rectangle; - - // methods - constructor (imageOrUrl: HTMLImageElement); - constructor (imageOrUrl: HTMLCanvasElement); - constructor (imageOrUrl: HTMLVideoElement); - constructor (imageOrUrl: string); - - clone(): Bitmap; - } - - export class BitmapText extends DisplayObject { - // properties - letterSpacing: number; - lineHeight: number; - spaceWidth: number; - spriteSheet: SpriteSheet; - text: String; - - // methods - constructor(text?: string, spriteSheet?: SpriteSheet); - } - - /** - * @deprecated renamed to Sprite, here for backwards compatibility - */ - export class BitmapAnimation extends Sprite { - } - - /** - * Sprite - */ - export class Sprite extends DisplayObject { - // properties - currentAnimation: string; - currentAnimationFrame: number; - currentFrame: number; - framerate: number; - /** - * @deprecated - */ - offset: number; - paused: boolean; - spriteSheet: SpriteSheet; - - // methods - constructor(spriteSheet: SpriteSheet, frameOrAnimation?: number); - constructor(spriteSheet: SpriteSheet, frameOrAnimation?: string); - advance(time?: number): void; - clone(): Sprite; - gotoAndPlay(frameOrAnimation: string): void; - gotoAndPlay(frameOrAnimation: number): void; - gotoAndStop(frameOrAnimation: string): void; - gotoAndStop (frameOrAnimation: number): void; - play(): void; - stop(): void; - } - - export class ButtonHelper { - // properties - target: Object; // MovieClip or Sprite - overLabel: string; - outLabel: string; - downLabel: string; - play: boolean; - - // methods - constructor(target: MovieClip, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string); - constructor(target: Sprite, outLabel?: string, overLabel?: string, downLabel?: string, play?: boolean, hitArea?: DisplayObject, hitLabel?: string); - setEnabled(value: boolean): void; - toString(): string; - } - - export class BlurFilter extends Filter { - // properties - blurX: number; - blurY: number; - quality: number; - - // methods - constructor (blurX?: number, blurY?: number, quality?: number); - clone(): BlurFilter; - } - - - export class ColorFilter extends Filter { - // properties - alphaOffset: number; - alphaMultiplier: number; - blueMultiplier: number; - blueOffset: number; - greenMultiplier: number; - greenOffset: number; - redMultiplier: number; - redOffset: number; - - // methods - constructor (redMultiplier?: number, greenMultiplier?: number, blueMultiplier?: number, alphaMultiplier?: number, redOffset?: number, greenOffset?: number, blueOffset?: number, alphaOffset?: number); - clone(): ColorFilter; - } - - - export class ColorMatrix { - // properties - static DELTA_INDEX: number[]; - static IDENTITY_MATRIX: number[]; - static LENGTH: number; - - // methods - constructor (brightness: number, contrast: number, saturation: number, hue: number); - adjustBrightness(value: number): ColorMatrix; - adjustColor(brightness: number, contrast: number, saturation: number, hue: number): ColorMatrix; - adjustContrast(value: number): ColorMatrix; - adjustHue(value: number): ColorMatrix; - adjustSaturation(value: number): ColorMatrix; - clone(): ColorMatrix; - concat(matrix: ColorMatrix): ColorMatrix; - concat(matrix: number[]): ColorMatrix; - copyMatrix(matrix: ColorMatrix): ColorMatrix; - copyMatrix(matrix: number[]): ColorMatrix; - reset(): ColorMatrix; - toArray(): number[]; - } - - - export class ColorMatrixFilter extends Filter { - // methods - constructor (matrix: number[]); - clone(): ColorMatrixFilter; - } - - - export class Command { - // methods - constructor (f: any, params: any, path: any); - exec(scope: any): void; - } - - - export class Container extends DisplayObject { - // properties - children: DisplayObject[]; - mouseChildren: boolean; - - // methods - constructor(); - 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; - 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; - removeAllChildren(): void; - removeChild(...child: DisplayObject[]): boolean; - removeChildAt(...index: number[]): boolean; - setChildIndex(child: DisplayObject, index: number): void; - sortChildren(sortFunction: (a: DisplayObject, b: DisplayObject) => number): void; - swapChildren(child1: DisplayObject, child2: DisplayObject): void; - swapChildrenAt(index1: number, index2: number): void; - } - - - export class DOMElement extends DisplayObject { - // properties - htmlElement: HTMLElement; - - // methods - constructor (htmlElement: HTMLElement); - clone(): DOMElement; - } - - - export class EaselJS { - // properties - version: string; - buildDate: string; - } - - export class Event { - // properties - bubbles: boolean; - cancelable: boolean; - currentTarget: Object; - defaultPrevented: boolean; - eventPhase: number; - immediatePropagationStopped: boolean; - propagationStopped: boolean; - removed: boolean; - target: Object; - timeStamp: number; - type: String; - - // methods - constructor (type: String, bubbles: boolean, cancelable: boolean); - clone(): Event; - preventDefault(): void; - remove(): void - stopImmediatePropagation(): void; - stopPropagation(): void; - toString(): string; - } - - export class EventDispatcher { - // properties - - // methods - static initialize(target: Object): void; - - 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; - toString(): string; - } - - export class Graphics { + constructor(); + // properties static BASE_64: Object; + static Command: Function; static STROKE_CAPS_MAP: string[]; static STROKE_JOINTS_MAP: string[]; @@ -371,66 +417,69 @@ declare module createjs { clear(): Graphics; clone(): Graphics; closePath(): Graphics; - curveTo(cpx: number, cpy: number, x: number, y: number): Graphics; // same as quadraticCurveTo() + curveTo (cpx: number, cpy: number, x: number, y: number): Graphics; decodePath(str: string): Graphics; draw(ctx: CanvasRenderingContext2D): void; drawAsPath(ctx: CanvasRenderingContext2D): void; drawCircle(x: number, y: number, radius: number): Graphics; - drawEllipse(x: number, y: number, width: number, height: number): Graphics; + drawEllipse(x: number, y: number, w: number, h: number): Graphics; drawPolyStar(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics; - drawRect(x: number, y: number, width: number, height: number): Graphics; // same as rect() - drawRoundRect(x: number, y: number, width: number, height: number, radius: number): Graphics; - drawRoundRectComplex(x: number, y: number, width: number, height: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics; + drawRect(x: number, y: number, w: number, h: number): Graphics; + drawRoundRect(x: number, y: number, w: number, h: number, radius: number): Graphics; + drawRoundRectComplex(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics; endFill(): Graphics; endStroke(): Graphics; static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string; - static getRGB(red: number, green: number, blue: number, alpha?: number): string; - inject(callback: Function, data: Object): Graphics; + static getRGB(r: number, g: number, b: number, alpha?: number): string; + inject(callback: Function, data: Object): Graphics; isEmpty(): boolean; lineTo(x: number, y: number): Graphics; moveTo(x: number, y: number): Graphics; quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): Graphics; - rect(x: number, y: number, width: number, height: number): Graphics; + rect(x: number, y: number, w: number, h: number): Graphics; setStrokeStyle(thickness: number, caps?: string, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; // caps and joints can be a string or number setStrokeStyle(thickness: number, caps?: number, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; setStrokeStyle(thickness: number, caps?: string, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; setStrokeStyle(thickness: number, caps?: number, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; toString(): string; - // tiny API - short forms of methods above - mt(x: number, y: number): Graphics; + + // tinyAPI 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; - qt(cpx: number, cpy: number, x: number, y: number): Graphics; - cp(): Graphics; - f(color: string): Graphics; - rf(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics; - ef(): Graphics; - s(color: string): Graphics; - rs(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics; - es(): Graphics; - rr(x: number, y: number, width: number, height: number, radius: number): Graphics; - dc(x: number, y: number, radius: number): Graphics; - dp(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics; - lt(x: number, y: number): Graphics; - bt(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics; - r(x: number, y: number, width: number, height: number): Graphics; - c(): Graphics; - lf(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics; bf(image: Object, repetition?: string, matrix?: Matrix2D): Graphics; - ss(thickness: number, caps?: string, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; + bs(image: Object, repetition?: string): Graphics; + f(color: string): Graphics; + lf(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics; + ls(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics; + rf(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics; + rs(colors: string[], ratios: number[], x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): Graphics; + s(color: string): Graphics; + bt(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): Graphics; + c(): Graphics; + cp(): Graphics; + p(str: string): Graphics; + dc(x: number, y: number, radius: number): Graphics; + de(x: number, y: number, w: number, h: number): Graphics; + dp(x: number, y: number, radius: number, sides: number, pointSize: number, angle: number): Graphics; + dr(x: number, y: number, w: number, h: number): Graphics; + rr(x: number, y: number, w: number, h: number, radius: number): Graphics; + rc(x: number, y: number, w: number, h: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics; + ef(): Graphics; + es(): Graphics; + lt(x: number, y: number): Graphics; + mt(x: number, y: number): Graphics; + qt(cpx: number, cpy: number, x: number, y: number): Graphics; + r(x: number, y: number, w: number, h: number): Graphics; + ss(thickness: number, caps?: string, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; // caps and joints can be a string or number ss(thickness: number, caps?: number, joints?: string, miterLimit?: number, ignoreScale?: boolean): Graphics; ss(thickness: number, caps?: string, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; ss(thickness: number, caps?: number, joints?: number, miterLimit?: number, ignoreScale?: boolean): Graphics; - ls(colors: string[], ratios: number[], x0: number, y0: number, x1: number, y1: number): Graphics; - bs(image: Object, repetition?: string): Graphics; - dr(x: number, y: number, width: number, height: number): Graphics; - rc(x: number, y: number, width: number, height: number, radiusTL: number, radiusTR: number, radiusBR: number, radisBL: number): Graphics; - de(x: number, y: number, width: number, height: number): Graphics; - p(str: string): Graphics; } export class Matrix2D { + constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number); + // properties a: number; alpha: number; @@ -445,7 +494,6 @@ declare module createjs { ty: number; // methods - constructor (a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number); append(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D; appendMatrix(matrix: Matrix2D): Matrix2D; appendProperties(alpha: number, shadow: Shadow, compositeOperation: string): Matrix2D; @@ -454,6 +502,7 @@ declare module createjs { copy(matrix: Matrix2D): Matrix2D; decompose(target: Object): Matrix2D; identity(): Matrix2D; + initialize(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D; invert(): Matrix2D; isIdentity(): boolean; prepend(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix2D; @@ -472,51 +521,58 @@ 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); + // properties - nativeEvent: NativeMouseEvent; + nativeEvent: HtmlMouseEvent; + onMouseMove: Function; // deprecated + onMouseUp: Function; // deprecated pointerID: number; primary: boolean; rawX: number; rawY: number; stageX: number; stageY: number; - + target: DisplayObject; + type: string; + // methods - constructor (type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number); clone(): MouseEvent; + toString(): string; + + // EventDispatcher mixins + addEventListener(type: string, listener: Function, useCapture?: boolean): any; + addEventListener(type: string, listener: Object, useCapture?: boolean): any; + 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: Function, useCapture?: boolean): void; + off(type: string, listener: Object, useCapture?: boolean): void; + on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; + on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + removeAllEventListeners(type?: string): void; + removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + removeEventListener(type: string, listener: Object, useCapture?: boolean): void; - // 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; + // events + /* + mousemove: (event: MouseEvent) => any; // deprecated + mouseup: (event: MouseEvent) => any; // deprecated + */ } export class MovieClip extends Container { + constructor(mode?: string, startPosition?: number, loop?: boolean, labels?: Object); + // properties actionsEnabled: boolean; autoReset: boolean; static buildDate: string; currentFrame: number; - frameBounds:Rectangle[]; + frameBounds: Rectangle[]; static INDEPENDENT: string; loop: boolean; mode: string; @@ -528,42 +584,51 @@ declare module createjs { static version: string; // methods - constructor (mode?: string, startPosition?: number, loop?: boolean, labels?: Object); - clone(): MovieClip; // not supported + clone(recursive?: boolean): Container; // throw error + draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; 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; } - - + + export class MovieClipPlugin { + // methods + tween(tween: Tween, prop: string, value: string, startValues: any[], endValues: any[], ratio: number, wait: Object, end: Object): void; + tween(tween: Tween, prop: string, value: number, startValues: any[], endValues: any[], ratio: number, wait: Object, end: Object): void; + tween(tween: Tween, prop: string, value: boolean, startValues: any[], endValues: any[], ratio: number, wait: Object, end: Object): void; + } + export class Point { + constructor(x?: number, y?: number); + // properties x: number; y: number; // methods - constructor (x?: number, y?: number); clone(): Point; copy(point: Point): Point; - initialize(x?: number, y?: number): Point; + initialize (x: number, y: number): Point; toString(): string; } - export class Rectangle { + constructor(x?: number, y?: number, width?: number, height?: number); + // properties + height: number; + width: number; x: number; y: number; - width: number; - height: number; // methods - constructor (x?: number, y?: number, width?: number, height?: number); clone(): Rectangle; copy(rectangle: Rectangle): Rectangle; initialize(x?: number, y?: number, width?: number, height?: number): Rectangle; @@ -572,6 +637,8 @@ declare module createjs { export class Shadow { + constructor(color: string, offsetX: number, offsetY: number, blur: number); + // properties blur: number; color: string; @@ -580,56 +647,95 @@ declare module createjs { offsetY: number; // methods - constructor (color: string, offsetX: number, offsetY: number, blur: number); clone(): Shadow; toString(): string; } export class Shape extends DisplayObject { + constructor(graphics?: Graphics); + // properties graphics: Graphics; // methods - constructor (graphics?: Graphics); clone(recursive?: boolean): Shape; } - // what is returned from SpriteSheet.getAnimation(string) - interface SpriteSheetAnimation { + export class Sprite extends DisplayObject { + constructor(spriteSheet: SpriteSheet, frameOrAnimation: string); + constructor(spriteSheet: SpriteSheet, frameOrAnimation: number); + + // properties + currentAnimation: string; + currentAnimationFrame: number; + currentFrame: number; + framerate: number; + offset: number; // deprecated + onAnimationEnd: Function; // deprecated + 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; + 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 { 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 - constructor (data: Object); clone(): SpriteSheet; - getAnimation(name: string): SpriteSheetAnimation; + getAnimation(name: string): SpriteSheetAnimationProp; getAnimations(): string[]; - getFrame(frameIndex: number): SpriteSheetFrame; + getFrame(frameIndex: number): Object; getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle; getNumFrames(animation: string): number; + toString(): string; + + // events + /* + complete : () => any; + */ } export class SpriteSheetBuilder extends EventDispatcher { // properties - maxWidth: number; maxHeight: number; + maxWidth: number; + onComplete: Function; // deprecated + onProgress: Function; // deprecated padding: number; progress: number; scale: number; @@ -638,58 +744,78 @@ declare module createjs { // methods addAnimation(name: string, frames: number[], next?: string, frequency?: number): void; - addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupParams?: any[], setupScope?: Object): any; //HERE returns number or null + addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupParams?: any[], setupScope?: Object): number; addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number): void; build(): SpriteSheet; buildAsync(timeSlice?: number): void; - clone(): SpriteSheetBuilder; + clone(): DisplayObject; // throw error 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; - static extractFrame(spriteSheet: SpriteSheet, frame: number): HTMLImageElement; - static extractFrame(spriteSheet: SpriteSheet, animationName: string): HTMLImageElement; - /** - * @deprecated - */ - static mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; + 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 mergeAlpha(rgbImage: HTMLImageElement, alphaImage: HTMLImageElement, canvas?: HTMLCanvasElement): HTMLCanvasElement; // deprecated } - export class Stage extends Container { + constructor(canvas: HTMLCanvasElement); + constructor(canvas: string); + constructor(canvas: Object); + // properties autoClear: boolean; - canvas: HTMLCanvasElement; + canvas: any; + handleEvent: Function; + hitArea: DisplayObject; mouseInBounds: boolean; mouseMoveOutside: boolean; mouseX: number; mouseY: number; nextStage: Stage; - /** - * @deprecated - */ - snapToPixelEnabled: boolean; + onMouseDown: Function; // deprecated + onMouseMove: Function; // deprecated + onMouseUp: Function; // deprecated + snapToPixelEnabled: boolean; // deprecated tickOnUpdate: boolean; - + // methods - constructor (canvas: HTMLCanvasElement); clear(): void; clone(): Stage; + draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; enableDOMEvents(enable?: boolean): void; enableMouseOver(frequency?: number): void; - handleEvent(evt: Object): void; - toDataURL(backgroundColor?: string, mimeType?: string): string; - update(...params: any[]): void; + hitTest(x: number, y: number): boolean; + isVisible(): boolean; + 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; + */ } export class Text extends DisplayObject { + constructor(text?: string, font?: string, color?: string); + // properties color: string; font: string; @@ -702,77 +828,59 @@ declare module createjs { textBaseline: string; // methods - constructor (text?: string, font?: string, color?: string); clone(): Text; + draw(ctx: CanvasRenderingContext2D, ignoreCache?: boolean): boolean; getMeasuredHeight(): number; getMeasuredLineHeight(): number; getMeasuredWidth(): number; + isVisible(): boolean; } - - export class Ticker { + export class Ticker extends EventDispatcher { // properties static maxDelta: number; static RAF: string; static RAF_SYNCHED: string; static TIMEOUT: string; static timingMode: string; - /** - * @deprecated - */ - static useRAF: boolean; + static useRAF: boolean; // deprecated // methods - getEventTime(runTime: boolean): number; + static getEventTime(runTime?: boolean): number; static getFPS(): number; static getInterval(): number; static getMeasuredFPS(ticks?: number): number; static getMeasuredTickTime(ticks?: number): number; static getPaused(): boolean; static getTicks(pauseable?: boolean): number; - static getTime(runTime: boolean): number; + static getTime(runTime?: boolean): number; static init(): void; static reset(): void; static setFPS(value: number): void; static setInterval(interval: number): void; static setPaused(value: boolean): void; - toString(): string; // EventDispatcher mixins - 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 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 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; - 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 removeAllEventListeners(type?: string): void; - static dispatchEvent(eventObj: string, target?: Object): boolean; + static addEventListener(type: string, listener: Function, useCapture?: boolean): any; + static addEventListener(type: string, listener: Object, useCapture?: boolean): any; 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: Function, useCapture?: boolean): void; + static off(type: string, listener: Object, useCapture?: boolean): void; + static on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; + static on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + static removeAllEventListeners(type?: string): void; + static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; - export class TickerEvent { - // properties - target: Object; - type: string; - paused: boolean; - delta: number; - time: number; - runTime : number; + // events + /* + tick: (timeElapsed: number) => any; + */ } - export class Touch { // methods static disable(stage: Stage): void; @@ -780,7 +888,6 @@ declare module createjs { static isSupported(): boolean; } - export class UID { // methods static get(): number; diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 3c8fa7e84..36ed7bf9c 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for PreloadJS 0.3 +// Type definitions for PreloadJS 0.4.0 // Project: http://www.createjs.com/#!/PreloadJS // Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -10,94 +10,106 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +// Library documentation : http://www.createjs.com/Docs/PreloadJS/modules/PreloadJS.html + +/// + declare module createjs { - export class AbstractLoader { + export class AbstractLoader extends EventDispatcher { // properties canceled: boolean; loaded: boolean; + onComplete: Function; // deprecated + onError: Function; // deprecated + onLoadStart: Function; // deprecated + onProgress: Function; // deprecated progress: number; - + // methods + buildPath(src: string, basePath?: string, data?: Object): string; close(): void; - getItem(value: string): Object; load(): void; toString(): string; - + // events + /* complete: (event: Object) => any; error: (event: Object) => any; - fileload: (event: Object) => any; - fileprogress: (event: Object) => any; loadStart: (event: Object) => 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; + progress: (event: Object) => any; + */ } - - export class PreloadJS { - version: string; - buildDate: string; - } - + export class LoadQueue extends AbstractLoader { - constructor (useXHR?: boolean); - + constructor(useXHR?: boolean, basePath?: string); + // properties static BINARY: string; static CSS: string; static IMAGE: string; static JAVASCRIPT: string; static JSON: string; - static SOUND: string; - static SVG: string; - static TEXT: string; + static JSONP: string; static LOAD_TIMEOUT: number; - static XML: string; - maintainScriptOrder: boolean; next: LoadQueue; + onFileLoad: Function; // deprecated + onFileProgress: Function; // deprecated + static SOUND: string; stopOnError: boolean; + static SVG: string; + static TEXT: string; useXHR: boolean; - + static XML: string; + // methods - BrowserDetect(): Object; - init(useXHR?: boolean): void; - close(): void; - initialize(useXHR: boolean): void; - installPlugin(plugin: any): void; - load(): void; - loadFile(file: Object, loadNow?: boolean): void; - loadFile(file: string, loadNow?: boolean): void; - loadManifest(manifest: Object[], loadNow?: boolean): void; - loadManifest(manifest: string[], loadNow?: boolean): void; getItem(value: string): Object; getResult(value: string, rawResult?: boolean): Object; - removeAll(): void; + installPlugin(plugin: Function): void; + loadFile(file: Object, loadNow?: boolean, basePath?: string): void; + loadFile(file: string, loadNow?: boolean, basePath?: string): void; + loadManifest(manifest: Object[], loadNow?: boolean, basePath?: string): void; + loadManifest(manifest: string[], loadNow?: boolean, basePath?: string): void; remove(idsOrUrls: string): void; - remove(idsOrUrls: Array): void; + remove(idsOrUrls: string[]): void; + removeAll(): void; reset(): void; setMaxConnections(value: number): void; - setUseXHR(value: boolean): 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 { + static buildDate: string; + static version: string; + } + export class TagLoader extends AbstractLoader { - constructor (item: Object, srcAttr: string, useXHR: boolean); - constructor (item: string, srcAttr: string, useXHR: boolean); - getResult(): any; // HTMLImageElement or HTMLAudioElement + constructor (item: Object); + + // properties + _isAudio: boolean; + + // methods + getResult(): any; + toString(): string; } - - + export class XHRLoader extends AbstractLoader { - constructor (file: Object); - getResult(rawResult?: boolean):any; + constructor (item: Object); + + // methods + getAllResponseHeaders(): string; + getResponseHeader(header: string): string; + getResult (rawResult?: boolean): Object; + toString(): string; } } diff --git a/soundjs/soundjs-tests.ts.tscparams b/soundjs/soundjs-tests.ts.tscparams deleted file mode 100644 index e16c76dff..000000000 --- a/soundjs/soundjs-tests.ts.tscparams +++ /dev/null @@ -1 +0,0 @@ -"" diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index 9307627f8..27b505501 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -1,4 +1,4 @@ -// Type definitions for SoundJS 0.4 +// Type definitions for SoundJS 0.5.0 // Project: http://www.createjs.com/#!/SoundJS // Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -12,205 +12,205 @@ // Library documentation : http://www.createjs.com/Docs/SoundJS/modules/SoundJS.html +/// + declare module createjs { export class FlashPlugin { + constructor(); + // properties static BASE_PATH: string; + static buildDate: string; static capabilities: Object; + flashReady: boolean; showOutput: boolean; - + static version: string; + // methods create(src: string): SoundInstance; - preload(src: string, instance: Object): void; - static generateCapabilities(): void; - static isSupported(): boolean; - isPreloadStarted(src: string): boolean; - register(src: string, instances: Number): Object; - setVolume(value: Number): boolean; - getVolume(): Number; - setMute(isMuted: boolean): Boolean; - toString(): string; - - // Flash API - unregisterPreloadInstance(flashId: string): void; - unregisterSoundInstance(flashId: string): void; - flashLog(data: string): void; - handleSoundEvent(flashId: string, method: string): void; - handlePreloadEvent(flashId: string, method: string): void; - handleEvent(method: string): void; - handleErrorEvent(error: string): void; - } - - export class HTMLAudioPlugin { - // properties - static capabilities: Object; - static MAX_INSTANCES: number; - static AUDIO_READY: string; - static AUDIO_ENDED: string; - static AUDIO_ERROR: string; - static AUDIO_STALLED: string; - capabilities:Object; - defaultNumChannels: number; - - // methods - create(src: string): SoundInstance; - static generateCapabilities(): void; - static isSupported(): boolean; - register(src: string, instances: number): Object; - isPreloadStarted(src: string): boolean; - preload(src: string, instance: Object): void; - toString(): string; - } - - export class WebAudioPlugin { - // properties - static capabilities: Object; - static MAX_INSTANCES: number; - static AUDIO_READY: string; - static AUDIO_ENDED: string; - static AUDIO_ERROR: string; - static AUDIO_STALLED: string; - arrayBuffers: ArrayBuffer[]; - capabilities:Object; - defaultNumChannels: number; - dynamicsCompressorNode: Object; - gainNode: Object; - volume: number; - context: any; - WebAudioLoader(src: string, owner: Object): Function; - - // methods - create(src: string): SoundInstance; - static generateCapabilities(): void; - static isSupported(): boolean; - setVolume(value: Number): boolean; - getVolume(): number; - register(src: string, instances: number): Object; - isPreloadStarted(src: string): boolean; - preload(src: string, instance: Object): void; - isPreloadComplete(src : string): boolean; - removeFromPreload(src: string); - setMute(value: number): boolean; - toString(): string; - } - - export class SoundInstance { - constructor (src: string, owner: string, flash: string); - - // properties - muted: boolean; - owner: HTMLAudioPlugin; - offset: number; - paused: boolean; - delay: number; - pan: number; - duration: number; - playState: string; - delayTimeoutId: number; - src: string; - uniqueId: any; //HERE string or number - volume: number; - - // methods - getDuration(): number; - getPan(): number; - getPosition(): number; + flashLog(data: string): void; getVolume(): number; - mute(isMuted: boolean): boolean; - pause(): boolean; - play(interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): void; - resume(): boolean; - setPan(value: number): number; - setPosition(value: number): void; + handleErrorEvent(error: string): void; + handleEvent(method: string): void; + handlePreloadEvent(flashId: string, method: string): void; + handleSoundEvent(flashId: string, method: string): void; + isPreloadStarted(src: string): boolean; + static isSupported(): boolean; + preload(src: string, instance: Object, basePath: string): void; + register(src: string, instances: number): Object; + registerPreloadInstance(flashId: string, instance: any): void; + registerSoundInstance(flashId: string, instance: any): void; + removeAllSounds (): void; + removeSound(src: string): void; + setMute(value: boolean): boolean; setVolume(value: number): boolean; - stop(): boolean; - - // events - complete: () => any; - loop: () => any; - failed: () => any; - interrupted: () => any; - succeeded: () => any; - ready: () => 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; + unregisterPreloadInstance(flashId: string): void; + unregisterSoundInstance(flashId: string, instance: any): void; } - - // Class documentation : http://www.createjs.com/Docs/SoundJS/classes/Sound.html - export class Sound { + + export class HTMLAudioPlugin { + constructor(); + + // properties + static AUDIO_ENDED: string; + static AUDIO_ERROR: string; + static AUDIO_READY: string; + static AUDIO_SEEKED: string; + static AUDIO_STALLED: string; + defaultNumChannels: number; + enableIOS: boolean; + static MAX_INSTANCES: number; + + // methods + create(src: string): SoundInstance; + isPreloadStarted(src: string): boolean; + static isSupported(): boolean; + preload(src: string, instance: Object, basePath: string): void; + register(src: string, instances: number): Object; + removeAllSounds(): void; + removeSound(src: string): void; + toString(): string; + } + + export class Sound extends EventDispatcher { // properties static activePlugin: Object; - static AUDIO_TIMEOUT: number; + static defaultInterruptBehavior: string; static DELIMITER: string; + static EXTENSION_MAP: Object; static INTERRUPT_ANY: string; static INTERRUPT_EARLY: string; static INTERRUPT_LATE: string; static INTERRUPT_NONE: string; - static muted: boolean; + static onLoadComplete: Function; // deprecated static PLAY_FAILED: string; static PLAY_FINISHED: string; static PLAY_INITED: string; static PLAY_INTERRUPTED: string; static PLAY_SUCCEEDED: string; - static SUPPORTED_EXTENSIONS: Array; - static EXTENSION_MAP: Object; - static defaultInterruptBehavior: string; + static SUPPORTED_EXTENSIONS: string[]; + + + // methods + static createInstance(src: string): SoundInstance; + static getCapabilities(): Object; + static getCapability(key: string): any; //HERE can return string | number | bool; + static getMute(): boolean; + static getVolume(): number; + 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; + static registerPlugins(plugins: any[]): boolean; + static registerSound(src: string, id?: string, data?: Object, preload?: boolean, basePath?: string): Object; + static registerSound(src: Object, id?: string, data?: Object, preload?: boolean, basePath?: string): Object; + static removeAllSounds(): void; + static removeManifest(manifest: any[]): Object; + static removeSound(src: string): boolean; + static removeSound(src: Object): boolean; + static setMute(value: boolean): boolean; + static setVolume(value: number): void; + static stop(): void; + static toString(): string; + + // events + /* + fileload: () => any; + */ + + // EventDispatcher mixins + static addEventListener(type: string, listener: Function, useCapture?: boolean): any; + static addEventListener(type: string, listener: Object, useCapture?: boolean): any; + 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: Function, useCapture?: boolean): void; + static off(type: string, listener: Object, useCapture?: boolean): void; + static on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; + static on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; + static removeAllEventListeners(type?: string): void; + + } + + export class SoundInstance extends EventDispatcher { + constructor(src: string, owner: Object); + + // 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; + sourceNode: any; + uniqueId: any; //HERE string or number + volume: number; // methods - static checkPlugin(initializeDefault: boolean): boolean; - static createInstance(src: string): SoundInstance; - static getCapabilities(): Object; - static getCapability(key: string): any; //HERE can return string | number | bool - static getInstanceById(uniqueId: string): SoundInstance; - static getMute(): boolean; - static getMasterVolume(): number; - static getSrcFromId(value: string): string; - static getVolume(): number; - static isReady(): boolean; - static pause(id: string): void; - static play(src: string, interrupt?: string, delay?: number, offset?: number, loop?: number, volume?: number, pan?: number): SoundInstance; - static registerPlugin(plugin: Object): boolean; - static registerPlugins(plugins: Object[]): boolean; - static registerSound(src: Object, id?: string, data?: Object, preload?: boolean): Object; - static registerManifest(manifest: Array); - static resume(id: string): void; - static setMasterVolume(value: number): boolean; - static setMute(isMuted: boolean): boolean; - static setVolume(value: number, id?: string): boolean; - static stop(): boolean; - - // events - static loadComplete: () => any; - - // EventDispatcher mixins - 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; + getDuration(): number; + getMute(): boolean; + 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; + resume(): boolean; + setMute(value: boolean): boolean; + setPan(value: number): number; + 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 BrowserDetect { - // properties - static isFirefox: boolean; - static isOpera: boolean; - static isChrome: boolean; - static isIOS: boolean; - static isAndroid: boolean; - static isBlackberry: boolean; - - // methods - static init(); + + export class SoundJS { + static buildDate: string; + static version: string; + } + + export class WebAudioPlugin { + constructor(); + + // properties + context: any; + dynamicsCompressorNode: any; + gainNode: any; + + // methods + addPreloadResults(src: string): boolean; + create(src: string): SoundInstance; + getVolume(): number; + isPreloadComplete(src: string): boolean; + isPreloadStarted(src: string): boolean; + static isSupported(): boolean; + playEmptySound(): void; + register(src: string, instances: number): Object; + removeAllSounds(src: string): void; + removeFromPreload(src: string): void; + removeSound(src: string): void; + setMute(value: boolean): boolean; + setVolume(value: Number): boolean; } - - export function proxy(handler: Function, context: any); } diff --git a/soundjs/soundjs.d.ts.tscparams b/soundjs/soundjs.d.ts.tscparams deleted file mode 100644 index e16c76dff..000000000 --- a/soundjs/soundjs.d.ts.tscparams +++ /dev/null @@ -1 +0,0 @@ -"" diff --git a/tweenjs/tweenjs-tests.ts.tscparams b/tweenjs/tweenjs-tests.ts.tscparams deleted file mode 100644 index e16c76dff..000000000 --- a/tweenjs/tweenjs-tests.ts.tscparams +++ /dev/null @@ -1 +0,0 @@ -"" diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts index 02742db66..171642e6e 100644 --- a/tweenjs/tweenjs.d.ts +++ b/tweenjs/tweenjs.d.ts @@ -1,6 +1,6 @@ -// Type definitions for TweenJS 0.5 +// Type definitions for TweenJS 0.5.0 // Project: http://www.createjs.com/#!/TweenJS -// Definitions by: Pedro Ferreira , Chris Smith +// Definitions by: Pedro Ferreira // Definitions: https://github.com/borisyankov/DefinitelyTyped /* @@ -12,16 +12,12 @@ // Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html +/// + declare module createjs { - - export class TweenJS { - // properties - version: string; - buildDate: string; - } - - export class CSSPlugin { + constructor(); + // properties static cssSuffixMap: Object; @@ -29,72 +25,89 @@ declare module createjs { static install(): void; } - export class Ease { - // properties - 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 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; - // methods - 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 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; + } + + export class MotionGuidePlugin { + constructor(); + + //methods + static install(): Object; } + export class SamplePlugin { + constructor(); - export class Timeline { + // properties + static priority: any; + + //methods + static init(tween: Tween, prop: string, value: any): any; + static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void; + static install(): void; + static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any; + } + + export class Timeline extends EventDispatcher { constructor (tweens: Tween[], labels: Object, props: Object); // properties duration: number; ignoreGlobalPause: boolean; loop: boolean; - position: number; + onChange: Function; // deprecated + position: Object; // methods addLabel(label: string, position: number): void; addTween(...tween: Tween[]): void; - getCurrentLabel(): string; - getLabels(): Object[]; + getCurrentLabel(): string; + getLabels(): Object[]; gotoAndPlay(positionOrLabel: string): void; gotoAndPlay(positionOrLabel: number): void; gotoAndStop(positionOrLabel: string): void; gotoAndStop(positionOrLabel: number): void; - removeTween(...tween: Tween[]): boolean; + removeTween(...tween: Tween[]): void; resolve(positionOrLabel: string): number; resolve(positionOrLabel: number): number; setLabels(o: Object): void; @@ -104,95 +117,57 @@ declare module createjs { toString(): string; updateDuration(): void; - // 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; + // events + /* + change: (instance: Timeline) => any; + */ } - export class Tween { - constructor (target: Object, props: Object, pluginData?: Object); + export class Tween extends EventDispatcher { + constructor(target: Object, props?: Object, pluginData?: Object); // properties duration: number; static IGNORE: Object; ignoreGlobalPause: boolean; - loop: boolean; static LOOP: number; + loop: boolean; static NONE: number; - passive:boolean; + onChange: Function; // deprecated + passive: boolean; pluginData: Object; - position: number; + position: Object; static REVERSE: number; target: Object; // methods - 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: any, props?: Object, pluginData?: Object, override?: boolean): Tween; - static hasActiveTweens(target?: any ): boolean; - static installPlugin(plugin: Object, properties: string[]): void; + call(callback: Function, params?: any[], scope?: Object): Tween; + static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween; + static hasActiveTweens(target?: Object): boolean; + static installPlugin(plugin: Object, properties: any[]): void; pause(tween: Tween): Tween; play(tween: Tween): Tween; static removeAllTweens(): void; - static removeTweens(target: any): void; - set(props: Object, target?: any ): Tween; + static removeTweens(target: Object): void; + set(props: Object, target?: Object): Tween; setPaused(value: boolean): Tween; setPosition(value: number, actionsMode: number): boolean; static tick(delta: number, paused: boolean): void; tick(delta: number): void; - to(props: Object, duration?: number, ease?: (amount: number) => number): Tween; + to(props: Object, duration?: number, ease?: (t: number) => number): Tween; toString(): string; - wait(duration: number, passive: boolean): Tween; + wait(duration: number, passive?: boolean): Tween; - // 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; + // events + /* + change: (event: any) => any; + */ } - - export class MotionGuidePlugin { + export class TweenJS { // properties - - //methods - static install(): Object; + static buildDate: string; + static version: string; } } From b0571086891a35a531cde7785e158376b5e0b220 Mon Sep 17 00:00:00 2001 From: s_kimura Date: Thu, 28 Nov 2013 11:36:03 +0900 Subject: [PATCH 2/5] fixed several syntax errors. --- createjs/createjs.d.ts | 10 +++++----- easeljs/easeljs-tests.ts | 2 +- easeljs/easeljs.d.ts | 34 +++++++++------------------------- preloadjs/preloadjs.d.ts | 2 +- soundjs/soundjs-tests.ts | 2 +- soundjs/soundjs.d.ts | 14 +++++++------- tweenjs/tweenjs-tests.ts | 3 ++- tweenjs/tweenjs.d.ts | 2 +- 8 files changed, 27 insertions(+), 42 deletions(-) diff --git a/createjs/createjs.d.ts b/createjs/createjs.d.ts index 9e66e79ee..7e6be561a 100644 --- a/createjs/createjs.d.ts +++ b/createjs/createjs.d.ts @@ -65,19 +65,19 @@ declare module createjs { constructor(); // methods - addEventListener(type: string, listener: Function, useCapture?: boolean): any; + addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; addEventListener(type: string, listener: Object, useCapture?: boolean): any; 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: Function, useCapture?: boolean): void; + off(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; off(type: string, listener: Object, useCapture?: boolean): void; - on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; - on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + 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; removeAllEventListeners(type?: string): void; - removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; removeEventListener(type: string, listener: Object, useCapture?: boolean): void; toString(): string; } diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts index 268e7381e..75eabca23 100644 --- a/easeljs/easeljs-tests.ts +++ b/easeljs/easeljs-tests.ts @@ -30,7 +30,7 @@ function test_animation() { ss.getAnimation("run").next = "jump"; ss.getAnimation("jump").next = "run"; - var sprite = new createjs.Sprite(ss); + var sprite:createjs.Sprite = new createjs.Sprite(ss); sprite.scaleY = sprite.scaleX = .4; sprite.gotoAndPlay("run"); diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index cdc798f63..d72dfa14c 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -398,7 +398,7 @@ declare module createjs { // properties static BASE_64: Object; - static Command: Function; + static Command: any; static STROKE_CAPS_MAP: string[]; static STROKE_JOINTS_MAP: string[]; @@ -431,7 +431,7 @@ declare module createjs { endStroke(): Graphics; static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string; static getRGB(r: number, g: number, b: number, alpha?: number): string; - inject(callback: Function, data: Object): Graphics; + inject(callback: (data: any) => any, data: any): Graphics; isEmpty(): boolean; lineTo(x: number, y: number): Graphics; moveTo(x: number, y: number): Graphics; @@ -540,22 +540,6 @@ declare module createjs { clone(): MouseEvent; toString(): string; - // EventDispatcher mixins - addEventListener(type: string, listener: Function, useCapture?: boolean): any; - addEventListener(type: string, listener: Object, useCapture?: boolean): any; - 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: Function, useCapture?: boolean): void; - off(type: string, listener: Object, useCapture?: boolean): void; - on(type: string, listener, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; - on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; - removeAllEventListeners(type?: string): void; - removeEventListener(type: string, listener: Function, useCapture?: boolean): void; - removeEventListener(type: string, listener: Object, useCapture?: boolean): void; - // events /* mousemove: (event: MouseEvent) => any; // deprecated @@ -664,8 +648,8 @@ declare module createjs { export class Sprite extends DisplayObject { - constructor(spriteSheet: SpriteSheet, frameOrAnimation: string); - constructor(spriteSheet: SpriteSheet, frameOrAnimation: number); + constructor(spriteSheet: SpriteSheet, frameOrAnimation?: string); + constructor(spriteSheet: SpriteSheet, frameOrAnimation?: number); // properties currentAnimation: string; @@ -861,18 +845,18 @@ declare module createjs { static setPaused(value: boolean): void; // EventDispatcher mixins - static addEventListener(type: string, listener: Function, useCapture?: boolean): any; + static addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; static addEventListener(type: string, listener: Object, useCapture?: boolean): any; 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: Function, useCapture?: boolean): void; + 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, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; - static on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; + 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 removeAllEventListeners(type?: string): void; - static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; + static removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; // events diff --git a/preloadjs/preloadjs.d.ts b/preloadjs/preloadjs.d.ts index 3ac27237d..21ace1154 100644 --- a/preloadjs/preloadjs.d.ts +++ b/preloadjs/preloadjs.d.ts @@ -65,7 +65,7 @@ declare module createjs { // methods getItem(value: string): Object; getResult(value: string, rawResult?: boolean): Object; - installPlugin(plugin: Function): void; + installPlugin(plugin: any): void; loadFile(file: Object, loadNow?: boolean, basePath?: string): void; loadFile(file: string, loadNow?: boolean, basePath?: string): void; loadManifest(manifest: Object[], loadNow?: boolean, basePath?: string): void; diff --git a/soundjs/soundjs-tests.ts b/soundjs/soundjs-tests.ts index 419587c25..fed2f37ff 100644 --- a/soundjs/soundjs-tests.ts +++ b/soundjs/soundjs-tests.ts @@ -5,7 +5,7 @@ // Feature set example: createjs.Sound.addEventListener("fileload", createjs.proxy(this.loadHandler, this)); createjs.Sound.registerSound("path/to/mySound.mp3|path/to/mySound.ogg", "sound"); -function loadHandler(event) { +function loadHandler(event):void { // This is fired for each sound that is registered. 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)); diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index 27b505501..d5836d3ef 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -122,19 +122,19 @@ declare module createjs { */ // EventDispatcher mixins - static addEventListener(type: string, listener: Function, useCapture?: boolean): any; + static addEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): any; static addEventListener(type: string, listener: Object, useCapture?: boolean): any; 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: Function, useCapture?: boolean): void; + 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, scope?: Function, once?: boolean, data?: any, useCapture?: boolean): Function; - static on(type: string, listener, scope?: Object, once?: boolean, data?: any, useCapture?: boolean): Function; - static removeEventListener(type: string, listener: Function, useCapture?: boolean): void; - static removeEventListener(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 removeAllEventListeners(type?: string): void; + static removeEventListener(type: string, listener: (eventObj: Object) => any, useCapture?: boolean): void; + static removeEventListener(type: string, listener: Object, useCapture?: boolean): void; } @@ -211,6 +211,6 @@ declare module createjs { removeFromPreload(src: string): void; removeSound(src: string): void; setMute(value: boolean): boolean; - setVolume(value: Number): boolean; + setVolume(value: number): boolean; } } diff --git a/tweenjs/tweenjs-tests.ts b/tweenjs/tweenjs-tests.ts index 2eeef2f90..63b0752e9 100644 --- a/tweenjs/tweenjs-tests.ts +++ b/tweenjs/tweenjs-tests.ts @@ -1,6 +1,7 @@ /// +/// -declare var target; +var target: createjs.DisplayObject = new createjs.DisplayObject(); var Tween = createjs.Tween; // source : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts index 171642e6e..a1e622c5a 100644 --- a/tweenjs/tweenjs.d.ts +++ b/tweenjs/tweenjs.d.ts @@ -142,7 +142,7 @@ declare module createjs { target: Object; // methods - call(callback: Function, params?: any[], scope?: Object): Tween; + call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween; static hasActiveTweens(target?: Object): boolean; static installPlugin(plugin: Object, properties: any[]): void; From 5f6f23fd768fc2793787a4575f17ef84ce8b2590 Mon Sep 17 00:00:00 2001 From: s_kimura Date: Thu, 28 Nov 2013 11:49:50 +0900 Subject: [PATCH 3/5] added type information in the test code. --- easeljs/easeljs-tests.ts | 15 +++++++-------- soundjs/soundjs-tests.ts | 2 +- tweenjs/tweenjs-tests.ts | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts index 75eabca23..7f946b9da 100644 --- a/easeljs/easeljs-tests.ts +++ b/easeljs/easeljs-tests.ts @@ -4,17 +4,16 @@ var stage: any; var myContext2D: any; function test_simple() { - var canvas = document.getElementById('canvas'); - var stage = new createjs.Stage(canvas); - var shape = new createjs.Shape(); + var canvas: HTMLCanvasElement = document.getElementById('canvas'); + var stage: createjs.Stage = new createjs.Stage(canvas); + var shape: createjs.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 = new createjs.SpriteSheet({ + var ss: createjs.SpriteSheet = new createjs.SpriteSheet({ "frames": { "width": 200, "numFrames": 64, @@ -30,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: createjs.Sprite = new createjs.Sprite(ss); sprite.scaleY = sprite.scaleX = .4; sprite.gotoAndPlay("run"); @@ -41,12 +40,12 @@ function test_animation() { } function test_graphics() { - var g = new createjs.Graphics(); + var g: createjs.Graphics = 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 = new createjs.Shape(g); + var s: createjs.Shape = new createjs.Shape(g); s.x = 100; s.y = 100; stage.addChild(s); diff --git a/soundjs/soundjs-tests.ts b/soundjs/soundjs-tests.ts index fed2f37ff..d3b60908a 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):void { // This is fired for each sound that is registered. - var instance = createjs.Sound.play("sound"); // play using id. Could also use full sourcepath or event.src. + var instance: createjs.SoundInstance = 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/tweenjs/tweenjs-tests.ts b/tweenjs/tweenjs-tests.ts index 63b0752e9..d05c8d9ac 100644 --- a/tweenjs/tweenjs-tests.ts +++ b/tweenjs/tweenjs-tests.ts @@ -2,7 +2,7 @@ /// var target: createjs.DisplayObject = new createjs.DisplayObject(); -var Tween = createjs.Tween; +var Tween: createjs.Tween = createjs.Tween; // source : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html // Chainable modules : From a41a87730af01aa664ee010f024655be2424627e Mon Sep 17 00:00:00 2001 From: s_kimura Date: Thu, 28 Nov 2013 12:19:00 +0900 Subject: [PATCH 4/5] added type information to tweenjs-test.ts and loadHandler method of soundjs-test.ts. --- soundjs/soundjs-tests.ts | 2 +- tweenjs/tweenjs-tests.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/soundjs/soundjs-tests.ts b/soundjs/soundjs-tests.ts index d3b60908a..39a0581b5 100644 --- a/soundjs/soundjs-tests.ts +++ b/soundjs/soundjs-tests.ts @@ -5,7 +5,7 @@ // Feature set example: createjs.Sound.addEventListener("fileload", createjs.proxy(this.loadHandler, this)); createjs.Sound.registerSound("path/to/mySound.mp3|path/to/mySound.ogg", "sound"); -function loadHandler(event):void { +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. instance.addEventListener("complete", createjs.proxy(this.handleComplete, this)); diff --git a/tweenjs/tweenjs-tests.ts b/tweenjs/tweenjs-tests.ts index d05c8d9ac..5cb3b79c6 100644 --- a/tweenjs/tweenjs-tests.ts +++ b/tweenjs/tweenjs-tests.ts @@ -2,12 +2,11 @@ /// var target: createjs.DisplayObject = new createjs.DisplayObject(); -var Tween: createjs.Tween = createjs.Tween; // source : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html // Chainable modules : target.alpha = 1; -Tween.get(target).wait(500, false).to({ alpha: 0, visible: false }, 1000).call(onComplete); +createjs.Tween.get(target).wait(500, false).to({ alpha: 0, visible: false }, 1000).call(onComplete); function onComplete() { //Tween complete } \ No newline at end of file From cea809114092cda6c2c0497467839479cd81d741 Mon Sep 17 00:00:00 2001 From: s_kimura Date: Fri, 29 Nov 2013 13:05:15 +0900 Subject: [PATCH 5/5] fixes bugs and discard redundant changes that have received pointed out in code review. put it back the SpriteSheetFrame and TickerEvent class in easelJS. --- createjs/createjs.d.ts | 32 +++-- easeljs/easeljs-tests.ts | 14 +- easeljs/easeljs.d.ts | 302 +++++++++++++-------------------------- preloadjs/preloadjs.d.ts | 23 --- soundjs/soundjs-tests.ts | 2 +- soundjs/soundjs.d.ts | 55 +++---- tweenjs/tweenjs-tests.ts | 2 +- tweenjs/tweenjs.d.ts | 97 ++++++------- 8 files changed, 198 insertions(+), 329 deletions(-) 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 {