You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/10/27 09:51:52 UTC
[royale-asjs] branch develop updated: adjust some ids to localIds
in Jewel lib
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 6aecf2f adjust some ids to localIds in Jewel lib
6aecf2f is described below
commit 6aecf2f89545fbd547f81a4241b53496afa09ae1
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Oct 27 11:51:45 2018 +0200
adjust some ids to localIds in Jewel lib
---
.../org/apache/royale/jewel/beads/views/AlertTitleBarView.mxml | 2 +-
.../org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml | 8 ++++----
.../royale/org/apache/royale/jewel/beads/views/TitleBarView.mxml | 4 ++--
.../royale/org/apache/royale/jewel/supportClasses/IActivable.as | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertTitleBarView.mxml b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertTitleBarView.mxml
index 93831d7..4be21cb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertTitleBarView.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertTitleBarView.mxml
@@ -40,6 +40,6 @@ limitations under the License.
<js:LayoutChangeNotifier watchedProperty="{titleLabel.text}" />
</js:beads>
- <j:Label id="titleLabel" text="{ITitleBarModel(model).title}"/>
+ <j:Label localId="titleLabel" text="{ITitleBarModel(model).title}"/>
</js:MXMLBeadView>
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
index 64b98f7..dcac86b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
@@ -38,23 +38,23 @@ limitations under the License.
<js:MXMLBeadViewDataBinding />
</js:beads>
- <j:Button id="textButton" text="JewelLabelViewBead" emphasis="{Button.PRIMARY}"/>
+ <j:Button localId="textButton" text="JewelLabelViewBead" emphasis="{Button.PRIMARY}"/>
<!--
<js:LayoutChangeNotifier watchedProperty="{additionalInfoLabel.text}" />
- <js:Label id="titleLabel" text="{CustomPanelWithControlBarModel(model).title}" className="TitleBarTitle" >
+ <js:Label localId="titleLabel" text="{CustomPanelWithControlBarModel(model).title}" className="TitleBarTitle" >
<js:style>
<js:SimpleCSSStyles fontWeight="inherit" marginLeft="5" />
</js:style>
</js:Label>
- <js:Label id="additionalInfoLabel" text="{CustomPanelWithControlBarModel(model).info}" height="16">
+ <js:Label localId="additionalInfoLabel" text="{CustomPanelWithControlBarModel(model).info}" height="16">
<js:style>
<js:SimpleCSSStyles fontWeight="inherit" marginRight="5" />
</js:style>
</js:Label>
- <js:CloseButton id="closeButton" click="clickHandler()" className="TitleBarCloseButton"
+ <js:CloseButton localId="closeButton" click="clickHandler()" className="TitleBarCloseButton"
visible="{CustomPanelWithControlBarModel(model).showCloseButton}"/>
-->
</js:MXMLBeadView>
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TitleBarView.mxml b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TitleBarView.mxml
index 9173ae0..595745f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TitleBarView.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TitleBarView.mxml
@@ -48,8 +48,8 @@ limitations under the License.
<js:LayoutChangeNotifier watchedProperty="{titleLabel.text}" />
</js:beads>
- <j:Label id="titleLabel" text="{ITitleBarModel(model).title}"/>
+ <j:Label localId="titleLabel" text="{ITitleBarModel(model).title}"/>
- <j:Button id="closeButton" click="clickHandler()" className="closebutton"/>
+ <j:Button localId="closeButton" click="clickHandler()" className="closebutton"/>
<!-- visible="{ITitleBarModel(model).showCloseButton}" -->
</js:MXMLBeadView>
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 4591316..603fc2e 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
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.supportClasses
public interface IActivable extends IId
{
/**
- * An id property for MXML documents.
+ * isActive checks if this object is the active one
*
* @langversion 3.0
* @playerversion Flash 10.2