A bit more strand work Should fix CreateJS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/676dfc7b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/676dfc7b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/676dfc7b Branch: refs/heads/feature/strand-work Commit: 676dfc7bbc08a6ce77d8a89347e4a42319963896 Parents: 2df19a4 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 9 00:15:29 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 9 00:15:29 2017 +0300 ---------------------------------------------------------------------- .../flex/org/apache/flex/core/Application.as | 4 ++-- .../org/apache/flex/core/HTMLElementWrapper.as | 4 ++-- .../main/flex/org/apache/flex/core/UIBase.as | 4 ++-- .../flex/org/apache/flex/core/UIButtonBase.as | 4 ++-- .../flex/org/apache/flex/html/MXMLBeadView.as | 4 ++-- .../org/apache/flex/html/beads/TextAreaView.as | 4 ++-- .../supportClasses/TextFieldItemRenderer.as | 4 ++-- .../flex/org/apache/flex/core/ElementWrapper.as | 8 +++---- .../main/flex/org/apache/flex/core/IStrand.as | 2 +- .../main/flex/org/apache/flex/core/Strand.as | 4 ++-- .../org/apache/flex/createjs/Application.as | 24 ++++---------------- .../org/apache/flex/createjs/core/UIBase.as | 14 +----------- 12 files changed, 26 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as index 2bda2ad..178bc8a 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as @@ -404,9 +404,9 @@ package org.apache.flex.core * @productversion FlexJS 0.9 */ COMPILE::SWF - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as index e594b7d..21de5f6 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as @@ -248,9 +248,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as index e83de17..41b05e5 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as @@ -1068,9 +1068,9 @@ package org.apache.flex.core * @productversion FlexJS 0.9 */ COMPILE::SWF - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } COMPILE::SWF http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as index bc84800..e4b8420 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as @@ -774,9 +774,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as index f436e19..a49cd6a 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as @@ -293,9 +293,9 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as index e41e446..cad85c6 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as @@ -243,9 +243,9 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as index 1599e20..b8cc0f2 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as @@ -518,9 +518,9 @@ package org.apache.flex.html.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as index be01864..d8d5ada 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as @@ -107,9 +107,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** @@ -306,9 +306,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as index a60e340..3cdbf73 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as @@ -70,7 +70,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - function addBeads():void; + function addBeads(dispatch:Boolean=true):void; /** * Find a bead on the strand. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as index f4953fa..5c1673a 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as @@ -161,9 +161,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as index d778020..cd2e575 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as @@ -175,8 +175,8 @@ package org.apache.flex.createjs * "inject_html" tag as follows: * * <inject_html> - * <script src="https://code.createjs.com/easeljs-0.8.1.min.js";></script> - * <script src="https://code.createjs.com/tweenjs-0.6.2.min.js";></script> + * <script src="//code.createjs.com/easeljs-0.8.1.min.js"></script> + * <script src="//code.createjs.com/tweenjs-0.6.2.min.js"></script> * </inject_html> */ public function Application() @@ -217,11 +217,7 @@ package org.apache.flex.createjs dispatchEvent('initialize'); - for (var index:int in beads) { - addBead(beads[index]); - } - - dispatchEvent(new org.apache.flex.events.Event("beadsAdded")); + addBeads(); initialView.applicationModel = this.model; addElement(initialView); @@ -350,19 +346,7 @@ package org.apache.flex.createjs { MXMLDataInterpreter.generateMXMLProperties(this, data); } - - /** - * The array property that is used to add additional - * beads to an MXML tag. From ActionScript, just - * call addBead directly. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public var beads:Array; - + /** * @copy org.apache.flex.core.IParent#addElement() * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as index d29fa51..5bb420b 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as @@ -211,16 +211,6 @@ package org.apache.flex.createjs.core } /** - * @copy org.apache.flex.core.Application#beads - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public var beads:Array; - - /** * The method called when added to a parent. This is a good * time to set up beads. * @@ -281,9 +271,7 @@ package org.apache.flex.createjs.core _height = _explicitHeight = value as Number; } } - - for each (var bead:IBead in beads) - addBead(bead); + addBeads(false); if (getBeadByType(IBeadModel) == null) {
