Skip to content

Commit

Permalink
- add new utilities functions (extend / promote)
Browse files Browse the repository at this point in the history
- add missing properties to some classes for easel 0.8
  • Loading branch information
noobiept committed Dec 13, 2014
1 parent e003f56 commit 17d3665
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 16 deletions.
3 changes: 3 additions & 0 deletions createjs-lib/createjs-lib.d.ts
Expand Up @@ -56,6 +56,7 @@ declare module createjs {
clone(): Event;
preventDefault(): void;
remove(): void;
set(props: Object): Event;
stopImmediatePropagation(): void;
stopPropagation(): void;
toString(): string;
Expand Down Expand Up @@ -93,7 +94,9 @@ declare module createjs {
willTrigger(type: string): boolean;
}

export function extend(subclass: () => any, superclass: () => any): () => any; // returns the subclass prototype
export function indexOf(array: any[], searchElement: Object): number;
export function promote(subclass: () => any, prefix: string): () => any;

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;
Expand Down
71 changes: 55 additions & 16 deletions easeljs/easeljs.d.ts
Expand Up @@ -183,9 +183,12 @@ declare module createjs {
getChildAt(index: number): DisplayObject;
getChildByName(name: string): DisplayObject;
getChildIndex(child: DisplayObject): number;
getNumChildren(): number; // deprecated - use numChildren property instead.
getObjectsUnderPoint(x: number, y: number): DisplayObject[];
getObjectUnderPoint(x: number, y: number): DisplayObject;
/**
* @deprecated - use numChildren property instead.
*/
getNumChildren(): number;
getObjectsUnderPoint(x: number, y: number, mode: number): DisplayObject[];
getObjectUnderPoint(x: number, y: number, mode: number): DisplayObject;
removeAllChildren(): void;
removeChild(...child: DisplayObject[]): boolean;
removeChildAt(...index: number[]): boolean;
Expand Down Expand Up @@ -242,13 +245,16 @@ declare module createjs {
getConcatenatedDisplayProps(props?: DisplayProps): DisplayProps;
getConcatenatedMatrix(mtx?: Matrix2D): Matrix2D;
getMatrix(matrix?: Matrix2D): Matrix2D;
getStage(): Stage; // deprecated
/**
* @deprecated
*/
getStage(): Stage;
getTransformedBounds(): Rectangle;
globalToLocal(x: number, y: number): Point;
globalToLocal(x: number, y: number, pt?: Object): Point; // 'pt' is Point or Object
hitTest(x: number, y: number): boolean;
isVisible(): boolean;
localToGlobal(x: number, y: number): Point;
localToLocal(x: number, y: number, target: DisplayObject): Point;
localToGlobal(x: number, y: number, pt?: Object): Point; // 'pt' is Point or Object
localToLocal(x: number, y: number, target: DisplayObject, pt?: Object): Point; // 'pt' is Point or Object
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;
Expand Down Expand Up @@ -363,6 +369,10 @@ declare module createjs {
endFill(): Graphics;
endStroke(): Graphics;
static getHSL(hue: number, saturation: number, lightness: number, alpha?: number): string;
/**
* @deprecated - use the instructions property instead
*/
getInstructions();
static getRGB(r: number, g: number, b: number, alpha?: number): string;
inject(callback: (data: any) => any, data: any): Graphics; // deprecated
isEmpty(): boolean;
Expand Down Expand Up @@ -620,6 +630,7 @@ declare module createjs {
constructor(type: string, bubbles: boolean, cancelable: boolean, stageX: number, stageY: number, nativeEvent: NativeMouseEvent, pointerID: number, primary: boolean, rawX: number, rawY: number);

// properties
isTouch: boolean;
localX: number;
localY: number;
nativeEvent: NativeMouseEvent;
Expand Down Expand Up @@ -687,8 +698,14 @@ declare module createjs {
// methods
advance(time?: number);
clone(): MovieClip; // not supported
/**
* @deprecated - use 'currentLabel' property instead
*/
getCurrentLabel(): string; // deprecated
getLabels(): Object[]; // deprecated
/**
* @deprecated - use 'labels' property instead
*/
getLabels(): Object[];
gotoAndPlay(positionOrLabel: string): void;
gotoAndPlay(positionOrLabel: number): void;
gotoAndStop(positionOrLabel: string): void;
Expand Down Expand Up @@ -833,6 +850,9 @@ declare module createjs {
// methods
clone(): SpriteSheet;
getAnimation(name: string): SpriteSheetAnimation;
/**
* @deprecated - use the 'animations' property instead
*/
getAnimations(): string[];
getFrame(frameIndex: number): SpriteSheetFrame;
getFrameBounds(frameIndex: number, rectangle?: Rectangle): Rectangle;
Expand All @@ -854,8 +874,8 @@ 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): number;
addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number): void;
addFrame(source: DisplayObject, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object): number;
addMovieClip(source: MovieClip, sourceRect?: Rectangle, scale?: number, setupFunction?: () => any, setupData?: Object, labelFunction?: () => any): void;
build(): SpriteSheet;
buildAsync(timeSlice?: number): void;
clone(): void; // throw error
Expand Down Expand Up @@ -921,6 +941,7 @@ declare module createjs {
clone(): Stage;
enableDOMEvents(enable?: boolean): void;
enableMouseOver(frequency?: number): void;
tick(props?: Object);
toDataURL(backgroundColor: string, mimeType: string): string;
update(...arg: any[]): void;

Expand Down Expand Up @@ -968,18 +989,36 @@ declare module createjs {

// methods
static getEventTime(runTime?: boolean): number;
static getFPS(): number; // deprecated
static getInterval(): number; // deprecated
/**
* @deprecated - use the 'framerate' property instead
*/
static getFPS(): number;
/**
* @deprecated - use the 'interval' property instead
*/
static getInterval(): number;
static getMeasuredFPS(ticks?: number): number;
static getMeasuredTickTime(ticks?: number): number;
static getPaused(): boolean; // deprecated
/**
* @deprecated - use the 'paused' property instead
*/
static getPaused(): boolean;
static getTicks(pauseable?: boolean): number;
static getTime(runTime?: boolean): number;
static init(): void;
static reset(): void;
static setFPS(value: number): void; // deprecated
static setInterval(interval: number): void; // deprecated
static setPaused(value: boolean): void; // deprecated
/**
* @deprecated - use the 'framerate' property instead
*/
static setFPS(value: number): void;
/**
* @deprecated - use the 'interval' property instead
*/
static setInterval(interval: number): void;
/**
* @deprecated - use the 'paused' property instead
*/
static setPaused(value: boolean): void;

// EventDispatcher mixins
static addEventListener(type: string, listener: Stage, useCapture?: boolean): Stage;
Expand Down

0 comments on commit 17d3665

Please sign in to comment.