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/11/18 10:51:25 UTC
[royale-asjs] branch develop updated: remove uncaught exceptions in
bindings in JewelExample and make wizard icons in example bigger
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 1a6f7a6 remove uncaught exceptions in bindings in JewelExample and make wizard icons in example bigger
1a6f7a6 is described below
commit 1a6f7a6c232cbf439b4c6718dfd87c8772cad86c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Nov 18 11:51:18 2018 +0100
remove uncaught exceptions in bindings in JewelExample and make wizard icons in example bigger
---
examples/royale/JewelExample/src/main/royale/WizardPlayGround.mxml | 4 ++--
.../src/main/royale/itemRenderers/IconListItemRenderer.mxml | 4 ++--
.../src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml | 4 ++--
.../src/main/royale/itemRenderers/TabBarIconItemRenderer.mxml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/WizardPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/WizardPlayGround.mxml
index cc0dadc..8d170d8 100644
--- a/examples/royale/JewelExample/src/main/royale/WizardPlayGround.mxml
+++ b/examples/royale/JewelExample/src/main/royale/WizardPlayGround.mxml
@@ -54,7 +54,7 @@ limitations under the License.
<j:Group>
<j:IconButton emphasis="{Button.SECONDARY}">
<j:icon>
- <js:FontIcon text="{MaterialIconType.KEYBOARD_ARROW_LEFT}" material="true"/>
+ <js:FontIcon text="{MaterialIconType.KEYBOARD_ARROW_LEFT}" material="true" size="48"/>
</j:icon>
</j:IconButton>
</j:Group>
@@ -64,7 +64,7 @@ limitations under the License.
<j:Group>
<j:IconButton emphasis="{Button.SECONDARY}">
<j:icon>
- <js:FontIcon text="{MaterialIconType.KEYBOARD_ARROW_RIGHT}" material="true"/>
+ <js:FontIcon text="{MaterialIconType.KEYBOARD_ARROW_RIGHT}" material="true" size="48"/>
</j:icon>
</j:IconButton>
</j:Group>
diff --git a/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml b/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
index 0f14474..2a2bef3 100644
--- a/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
+++ b/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
@@ -47,9 +47,9 @@ limitations under the License.
<js:ItemRendererDataBinding />
</j:beads>
- <js:FontIcon text="{iconList.icon}" material="true" visible="{iconList.icon != null}" click="clickCloseButton()"/>
+ <js:FontIcon text="{iconList ? iconList.icon : ''}" material="true" visible="{iconList ? iconList.icon != null : false}" click="clickCloseButton()"/>
- <html:Span text="{iconList.label}"/>
+ <html:Span text="{iconList ? iconList.label : ''}"/>
</j:ListItemRenderer>
diff --git a/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml b/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
index 7cf6f77..b7537d7 100644
--- a/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
+++ b/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
@@ -39,9 +39,9 @@ limitations under the License.
<js:ItemRendererDataBinding />
</j:beads>
- <js:FontIcon text="{navlink.icon}" material="true" visible="{navlink.icon != null}"/>
+ <js:FontIcon text="{navlink ? navlink.icon : ''}" material="true" visible="{navlink ? navlink.icon != null : false}"/>
- <html:Span text="{navlink.label}"/>
+ <html:Span text="{navlink ? navlink.label : ''}"/>
</j:NavigationLinkItemRenderer>
diff --git a/examples/royale/JewelExample/src/main/royale/itemRenderers/TabBarIconItemRenderer.mxml b/examples/royale/JewelExample/src/main/royale/itemRenderers/TabBarIconItemRenderer.mxml
index 08d4a37..da1c82c 100644
--- a/examples/royale/JewelExample/src/main/royale/itemRenderers/TabBarIconItemRenderer.mxml
+++ b/examples/royale/JewelExample/src/main/royale/itemRenderers/TabBarIconItemRenderer.mxml
@@ -39,9 +39,9 @@ limitations under the License.
<js:ItemRendererDataBinding />
</j:beads>
- <js:FontIcon text="{tabButton.icon}" material="true" visible="{tabButton.icon != null}"/>
+ <js:FontIcon text="{tabButton ? tabButton.icon : ''}" material="true" visible="{tabButton ? tabButton.icon != null : false}"/>
- <html:Span text="{tabButton.label}"/>
+ <html:Span text="{tabButton ? tabButton.label : ''}"/>
</j:TabBarButtonItemRenderer>