You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/04 07:27:46 UTC
[royale-asjs] branch feature/new_merge updated: Revert "This was
causing an RTE before the data was set."
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/new_merge by this push:
new 4403b2b Revert "This was causing an RTE before the data was set."
4403b2b is described below
commit 4403b2b93140c18f92231b854f79353195745da0
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Sep 4 10:26:13 2018 +0300
Revert "This was causing an RTE before the data was set."
This reverts commit b4faf9074de70fd8cce9cd6754960aca23be5bdd.
---
.../src/main/royale/itemRenderers/IconListItemRenderer.mxml | 2 +-
.../src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml b/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
index 3705753..0f14474 100644
--- a/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
+++ b/examples/royale/JewelExample/src/main/royale/itemRenderers/IconListItemRenderer.mxml
@@ -47,7 +47,7 @@ limitations under the License.
<js:ItemRendererDataBinding />
</j:beads>
- <js:FontIcon text="{iconList.icon}" material="true" visible="{iconList && iconList.icon != null}" click="clickCloseButton()"/>
+ <js:FontIcon text="{iconList.icon}" material="true" visible="{iconList.icon != null}" click="clickCloseButton()"/>
<html:Span text="{iconList.label}"/>
diff --git a/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml b/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
index 84e6bf0..7cf6f77 100644
--- a/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
+++ b/examples/royale/JewelExample/src/main/royale/itemRenderers/NavigationIconLinkItemRenderer.mxml
@@ -39,7 +39,7 @@ limitations under the License.
<js:ItemRendererDataBinding />
</j:beads>
- <js:FontIcon text="{navlink.icon}" material="true" visible="{navlink && navlink.icon != null}"/>
+ <js:FontIcon text="{navlink.icon}" material="true" visible="{navlink.icon != null}"/>
<html:Span text="{navlink.label}"/>