Skip to content

Commit b92388d

Browse files
committed
Merge pull request DefinitelyTyped#8495 from heroboy/patch-1
update easeljs: Conatiner.addChild
2 parents 758e777 + d3489ba commit b92388d

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

easeljs/easeljs-tests.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,18 @@ function matrixDecompose() {
8686
shape.skewX = transformData.skewX;
8787
shape.skewY = transformData.skewY;
8888
shape.rotation = transformData.rotation;
89-
}
89+
}
90+
91+
function test_addChild()
92+
{
93+
var container: createjs.Container;
94+
var textChild: createjs.Text;
95+
var displayObject: createjs.DisplayObject;
96+
97+
container.addChild(textChild).text = "abc";
98+
container.addChild(displayObject, textChild).text = "abc";
99+
container.addChild(displayObject, displayObject, textChild).text = "abc";
100+
container.addChild(displayObject, displayObject, displayObject, displayObject, displayObject, textChild);
101+
container.addChildAt(textChild, 0).text = "abc";
102+
container.addChildAt(displayObject, textChild, 0).text = "abc";
103+
}

easeljs/easeljs.d.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,16 @@ declare namespace createjs {
161161
tickChildren: boolean;
162162

163163
// methods
164-
addChild(...child: DisplayObject[]): DisplayObject;
165-
addChildAt(child: DisplayObject, index: number): DisplayObject; // add this for the common case
166-
addChildAt(...childOrIndex: any[]): DisplayObject; // actually (...child: DisplayObject[], index: number)
164+
addChild<T extends DisplayObject>(child: T): T;
165+
addChild<T extends DisplayObject>(child0: DisplayObject, lastChild: T): T;
166+
addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T): T;
167+
addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T;
168+
addChild(...children: DisplayObject[]): DisplayObject;
169+
addChildAt<T extends DisplayObject>(child: T, index: number): T;
170+
addChildAt<T extends DisplayObject>(child0: DisplayObject, lastChild: T, index: number): T;
171+
addChildAt<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T, index: number): T;
172+
addChildAt(...childOrIndex: (DisplayObject|number)[]): DisplayObject; // actually (...child: DisplayObject[], index: number)
173+
167174
clone(recursive?: boolean): Container;
168175
contains(child: DisplayObject): boolean;
169176
getChildAt(index: number): DisplayObject;

0 commit comments

Comments
 (0)