This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push: new f47a24a improve IActivable to not rely on ids and use new activableName property f47a24a is described below commit f47a24a6cade10a8da297f2f9cd86dc4632754e6 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Wed Dec 26 10:50:21 2018 +0100 improve IActivable to not rely on ids and use new activableName property --- .../apache/royale/jewel/ApplicationMainContent.as | 6 +++--- .../org/apache/royale/jewel/SectionContent.as | 23 ++++++++++++++++++++++ .../org/apache/royale/jewel/TabBarContent.as | 6 +++--- .../org/apache/royale/jewel/WizardContent.as | 6 +++--- .../royale/jewel/supportClasses/IActivable.as | 11 +++++++++++ 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as index 21c47a0..389c209 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as @@ -85,14 +85,14 @@ package org.apache.royale.jewel /** * shows a concrete content and hides the rest * - * @param id, the id of the container to show + * @param activableName, the activableName of the container to show * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 */ - public function showContent(id:String):void + public function showContent(activableName:String):void { try { @@ -100,7 +100,7 @@ package org.apache.royale.jewel { var content:IActivable = getElementAt(i) as IActivable; - if(content.id == id) + if(content.activableName == activableName) { content.isActive = true; } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as index 056514e..515320e 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as @@ -87,5 +87,28 @@ package org.apache.royale.jewel toggleClass("is-active", _isActive); } } + + private var _activableName:String; + + /** + * activableName is the name od this activable content + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9.4 + */ + public function get activableName():String + { + return _activableName; + } + + public function set activableName(value:String):void + { + if (_activableName != value) + { + _activableName = value; + } + } } } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as index 7bd118e..91b95d1 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as @@ -56,14 +56,14 @@ package org.apache.royale.jewel /** * shows a concrete content and hides the rest * - * @param id, the id of the container to show + * @param name, the name of the container to show * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 */ - public function showContent(id:String):void + public function showContent(activableName:String):void { try { @@ -71,7 +71,7 @@ package org.apache.royale.jewel { var content:IActivable = getElementAt(i) as IActivable; - if(content.id == id) + if(content.activableName == activableName) { content.isActive = true; } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as index 31521a8..ad94fea 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as @@ -57,14 +57,14 @@ package org.apache.royale.jewel /** * shows a concrete content and hides the rest * - * @param id, the id of the container to show + * @param activableName, the activableName of the container to show * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 */ - public function showContent(id:String):void + public function showContent(activableName:String):void { try { @@ -72,7 +72,7 @@ package org.apache.royale.jewel { var content:IActivable = getElementAt(i) as IActivable; - if(content.id == id) + if(content.activableName == activableName) { content.isActive = true; } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as index 603fc2e..bb344e9 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IActivable.as @@ -41,5 +41,16 @@ package org.apache.royale.jewel.supportClasses */ function get isActive():Boolean; function set isActive(value:Boolean):void; + + /** + * activableName is the name od this activable content + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9.4 + */ + function get activableName():String; + function set activableName(value:String):void; } }