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 2019/12/12 23:47:22 UTC
[royale-asjs] 21/42: jewel-buttonbar: improvements to example
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
commit af7f91a683fc5d9cf081e2c10072c740550299e1
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Dec 2 14:53:07 2019 +0100
jewel-buttonbar: improvements to example
---
.../TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml | 14 ++++++++------
.../TourDeJewel/src/main/royale/models/ListsModel.as | 10 ++++++++++
.../royale/jewel/itemRenderers/ButtonBarItemRenderer.as | 1 -
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 6175926..3b0c965 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -28,6 +28,10 @@ limitations under the License.
<js:ContainerDataBinding/>
</c:beads>
+ <c:model>
+ <models:ListsModel id="listModel"/>
+ </c:model>
+
<j:Grid gap="true" itemsVerticalAlign="itemsSameHeight">
<j:GridCell desktopNumerator="1" desktopDenominator="2" tabletNumerator="1" tabletDenominator="2" phoneNumerator="1" phoneDenominator="1">
<j:Card>
@@ -39,12 +43,10 @@ limitations under the License.
</j:dataProvider>
</j:ButtonBar>
- <j:ButtonBar localId="bb" change="bb_label.text = bb.selectedItem as String"
- emphasis="primary">
- <j:dataProvider>
- <js:ArrayList source="[Iron Man, Hulk, Thor, Captain America, Black Widow]" />
- </j:dataProvider>
- </j:ButtonBar>
+ <j:ButtonBar localId="bb" change="bb_label.text = bb.selectedItem.label"
+ emphasis="primary"
+ dataProvider="{listModel.suravengers}"/>
+
<j:Label localId="bb_label"/>
</j:Card>
</j:GridCell>
diff --git a/examples/royale/TourDeJewel/src/main/royale/models/ListsModel.as b/examples/royale/TourDeJewel/src/main/royale/models/ListsModel.as
index 873deda..dcc8649 100644
--- a/examples/royale/TourDeJewel/src/main/royale/models/ListsModel.as
+++ b/examples/royale/TourDeJewel/src/main/royale/models/ListsModel.as
@@ -60,6 +60,16 @@ package models
return _avengers;
}
+ private var _suravengers:ArrayList = new ArrayList([
+ new IconListVO("Hulk", MaterialIconType.WEB_ASSET),
+ new IconListVO("Thor", MaterialIconType.WEB_ASSET),
+ new IconListVO("Hawkeye", MaterialIconType.WEB_ASSET)
+ ]);
+
+ public function get suravengers():ArrayList
+ {
+ return _suravengers;
+ }
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
index 438b7a4..794a89c 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ButtonBarItemRenderer.as
@@ -110,7 +110,6 @@ package org.apache.royale.jewel.itemRenderers
*/
private var _itemRendererParent:Object;
-
/**
* The parent container for the itemRenderer instance.
*