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/09/15 22:01:31 UTC

[royale-asjs] branch develop updated: improve nav renderers

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 b038a91  improve nav renderers
b038a91 is described below

commit b038a91377c2f6efc45ca6d15951634fd35fe51c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 16 00:01:24 2018 +0200

    improve nav renderers
---
 .../jewel/itemRenderers/NavigationLinkItemRenderer.as     | 15 ++++++++++-----
 .../jewel/itemRenderers/TabBarButtonItemRenderer.as       | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
index 53a70e9..42a13e0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
@@ -20,6 +20,8 @@ package org.apache.royale.jewel.itemRenderers
 {
 	import org.apache.royale.core.StyledMXMLItemRenderer;
 	import org.apache.royale.jewel.supportClasses.INavigationRenderer;
+	import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
+	import org.apache.royale.events.Event;
     
     COMPILE::JS
     {
@@ -124,6 +126,7 @@ package org.apache.royale.jewel.itemRenderers
 			{
 				text = String(value);
 			}
+			// text = getLabelFromData(this, value);
 			
             if(value.href !== undefined)
 			{
@@ -132,12 +135,14 @@ package org.apache.royale.jewel.itemRenderers
 
 			COMPILE::JS
 			{
-				if(textNode != null)
-				{
-					textNode.nodeValue = text;
-                    (element as HTMLElement).setAttribute('href', href);
-				}	
+			if(textNode != null)
+			{
+				textNode.nodeValue = text;
+				(element as HTMLElement).setAttribute('href', href);
+			}	
 			}
+
+			dispatchEvent(new Event("dataChange"));
 		}
 
         /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
index 904d7fd..6858666 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
@@ -20,6 +20,8 @@ package org.apache.royale.jewel.itemRenderers
 {
 	import org.apache.royale.core.StyledMXMLItemRenderer;
 	import org.apache.royale.jewel.supportClasses.INavigationRenderer;
+	import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
+	import org.apache.royale.events.Event;
     
     COMPILE::JS
     {
@@ -124,6 +126,7 @@ package org.apache.royale.jewel.itemRenderers
 			{
 				text = String(value);
 			}
+			// text = getLabelFromData(this, value);
 			
             if(value.href !== undefined)
 			{
@@ -132,12 +135,14 @@ package org.apache.royale.jewel.itemRenderers
 
 			COMPILE::JS
 			{
-				if(textNode != null)
-				{
-					textNode.nodeValue = text;
-                    (element as HTMLElement).setAttribute('href', href);
-				}	
+			if(textNode != null)
+			{
+				textNode.nodeValue = text;
+				(element as HTMLElement).setAttribute('href', href);
+			}	
 			}
+
+			dispatchEvent(new Event("dataChange"));
 		}
 
         /**