From cae6927e01e6cfa3bb8674c6f2d3da0f624c6c3b Mon Sep 17 00:00:00 2001 From: heroboy Date: Fri, 11 Mar 2016 10:01:35 +0800 Subject: [PATCH 1/3] update addChild. --- easeljs/easeljs.d.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index f18cabdcb..a7fbb9b48 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -161,9 +161,16 @@ declare module createjs { tickChildren: boolean; // 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) + addChild(child: T): T; + addChild(child0: DisplayObject, lastChild: T): T; + addChild(child0: DisplayObject, child1: DisplayObject, lastChild: T): T; + addChild(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T; + addChild(...children: DisplayObject[]): DisplayObject; + addChildAt(child: T, index: number): T; + addChildAt(child0: DisplayObject, lastChild: T, index: number): T; + addChildAt(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T; + addChildAt(...childOrIndex: (DisplayObject|number)[]): DisplayObject; // actually (...child: DisplayObject[], index: number) + clone(recursive?: boolean): Container; contains(child: DisplayObject): boolean; getChildAt(index: number): DisplayObject; From bd4256fcbc8c5668f0b5780a99ee4fb7410e390d Mon Sep 17 00:00:00 2001 From: heroboy Date: Fri, 11 Mar 2016 10:04:44 +0800 Subject: [PATCH 2/3] format code --- easeljs/easeljs.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/easeljs/easeljs.d.ts b/easeljs/easeljs.d.ts index a7fbb9b48..446d33981 100644 --- a/easeljs/easeljs.d.ts +++ b/easeljs/easeljs.d.ts @@ -163,12 +163,12 @@ declare module createjs { // methods addChild(child: T): T; addChild(child0: DisplayObject, lastChild: T): T; - addChild(child0: DisplayObject, child1: DisplayObject, lastChild: T): T; - addChild(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T; - addChild(...children: DisplayObject[]): DisplayObject; - addChildAt(child: T, index: number): T; - addChildAt(child0: DisplayObject, lastChild: T, index: number): T; - addChildAt(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T; + addChild(child0: DisplayObject, child1: DisplayObject, lastChild: T): T; + addChild(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T; + addChild(...children: DisplayObject[]): DisplayObject; + addChildAt(child: T, index: number): T; + addChildAt(child0: DisplayObject, lastChild: T, index: number): T; + addChildAt(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T; addChildAt(...childOrIndex: (DisplayObject|number)[]): DisplayObject; // actually (...child: DisplayObject[], index: number) clone(recursive?: boolean): Container; From d3489ba45682b98ff3132cb6fffad7d351d0383d Mon Sep 17 00:00:00 2001 From: heroboy Date: Fri, 11 Mar 2016 10:14:17 +0800 Subject: [PATCH 3/3] add test addChild --- easeljs/easeljs-tests.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/easeljs/easeljs-tests.ts b/easeljs/easeljs-tests.ts index a01701a72..2e4b854c6 100644 --- a/easeljs/easeljs-tests.ts +++ b/easeljs/easeljs-tests.ts @@ -86,4 +86,18 @@ function matrixDecompose() { shape.skewX = transformData.skewX; shape.skewY = transformData.skewY; shape.rotation = transformData.rotation; -} \ No newline at end of file +} + +function test_addChild() +{ + var container: createjs.Container; + var textChild: createjs.Text; + var displayObject: createjs.DisplayObject; + + container.addChild(textChild).text = "abc"; + container.addChild(displayObject, textChild).text = "abc"; + container.addChild(displayObject, displayObject, textChild).text = "abc"; + container.addChild(displayObject, displayObject, displayObject, displayObject, displayObject, textChild); + container.addChildAt(textChild, 0).text = "abc"; + container.addChildAt(displayObject, textChild, 0).text = "abc"; +}