This is an automated email from the ASF dual-hosted git repository. harbs pushed a commit to branch feature/strandwork in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit bffac80b46684559ef92ff0f0a2817be558ce4c3 Author: Harbs <[email protected]> AuthorDate: Thu Dec 7 17:17:40 2017 +0200 a bit more strand work --- .../royale/org/apache/royale/core/Application.as | 4 ++-- .../org/apache/royale/core/HTMLElementWrapper.as | 4 ++-- .../src/main/royale/org/apache/royale/core/UIBase.as | 4 ++-- .../royale/org/apache/royale/core/UIButtonBase.as | 4 ++-- .../royale/org/apache/royale/html/MXMLBeadView.as | 4 ++-- .../org/apache/royale/html/beads/TextAreaView.as | 4 ++-- .../html/supportClasses/TextFieldItemRenderer.as | 4 ++-- .../royale/org/apache/royale/core/ElementWrapper.as | 8 ++++---- .../main/royale/org/apache/royale/core/IStrand.as | 2 +- .../src/main/royale/org/apache/royale/core/Strand.as | 4 ++-- .../royale/org/apache/royale/createjs/Application.as | 20 ++------------------ .../royale/org/apache/royale/createjs/core/UIBase.as | 14 +------------- 12 files changed, 24 insertions(+), 52 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as index 710916f..6bb28ab 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as @@ -403,9 +403,9 @@ package org.apache.royale.core * @productversion Royale 0.9 */ COMPILE::SWF - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as index 4d29a6b..1d34f0e 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as @@ -249,9 +249,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as index ad3df8d..483d4cb 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as @@ -1061,9 +1061,9 @@ package org.apache.royale.core * @productversion Royale 0.9 */ COMPILE::SWF - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } COMPILE::SWF diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as index 4951813..7bb5f10 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as @@ -774,9 +774,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as index 956adaf..b570567 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as @@ -293,9 +293,9 @@ package org.apache.royale.html * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as index 8e8bd10..6024857 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as @@ -243,9 +243,9 @@ package org.apache.royale.html.beads * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as index 7d46a54..5e2f8d5 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as @@ -519,9 +519,9 @@ package org.apache.royale.html.supportClasses * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as index f1c158b..141d799 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as @@ -111,9 +111,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** @@ -311,9 +311,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrand.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrand.as index af128a1..984e0ff 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrand.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStrand.as @@ -70,7 +70,7 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - function addBeads():void; + function addBeads(dispatch:Boolean=true):void; /** * Find a bead on the strand. diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as index 071b455..5c12ca2 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as @@ -161,9 +161,9 @@ package org.apache.royale.core * @playerversion AIR 2.6 * @productversion Royale 0.9 */ - public function addBeads():void + public function addBeads(dispatch:Boolean=true):void { - addBeadsToStrand(this,beads); + addBeadsToStrand(this,beads,dispatch); } /** diff --git a/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/Application.as b/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/Application.as index 5790f56..931bf05 100644 --- a/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/Application.as +++ b/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/Application.as @@ -216,11 +216,7 @@ package org.apache.royale.createjs dispatchEvent('initialize'); - for (var index:int in beads) { - addBead(beads[index]); - } - - dispatchEvent(new org.apache.royale.events.Event("beadsAdded")); + addBeads(); initialView.applicationModel = this.model; addElement(initialView); @@ -349,19 +345,7 @@ package org.apache.royale.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 Royale 0.0 - */ - public var beads:Array; - + /** * @copy org.apache.royale.core.IParent#addElement() * diff --git a/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/core/UIBase.as b/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/core/UIBase.as index 4f3cacd..61c69cb 100644 --- a/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/core/UIBase.as +++ b/frameworks/projects/CreateJS/src/main/royale/org/apache/royale/createjs/core/UIBase.as @@ -211,16 +211,6 @@ package org.apache.royale.createjs.core } /** - * @copy org.apache.royale.core.Application#beads - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 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.royale.createjs.core _height = _explicitHeight = value as Number; } } - - for each (var bead:IBead in beads) - addBead(bead); + addBeads(false); if (getBeadByType(IBeadModel) == null) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
