Merge pull request #8495 from heroboy/patch-1

update easeljs: Conatiner.addChild
This commit is contained in:
Masahiro Wakame
2016-03-26 21:43:59 +09:00
2 changed files with 25 additions and 4 deletions

View File

@@ -86,4 +86,18 @@ function matrixDecompose() {
shape.skewX = transformData.skewX;
shape.skewY = transformData.skewY;
shape.rotation = transformData.rotation;
}
}
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";
}

13
easeljs/easeljs.d.ts vendored
View File

@@ -161,9 +161,16 @@ declare namespace 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<T extends DisplayObject>(child: T): T;
addChild<T extends DisplayObject>(child0: DisplayObject, lastChild: T): T;
addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, lastChild: T): T;
addChild<T extends DisplayObject>(child0: DisplayObject, child1: DisplayObject, child2: DisplayObject, lastChild: T): T;
addChild(...children: DisplayObject[]): DisplayObject;
addChildAt<T extends DisplayObject>(child: T, index: number): T;
addChildAt<T extends DisplayObject>(child0: DisplayObject, lastChild: T, index: number): T;
addChildAt<T extends DisplayObject>(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;