[royale-asjs] branch develop updated: jewel: little fixes and clenaning

[carlosrovira]

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 550a049  jewel: little fixes and clenaning
550a049 is described below

commit 550a049972b3344e5f6a98cb4dc2a17bbd857669
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Wed Feb 5 16:31:04 2020 +0100

    jewel: little fixes and clenaning
---
 .../main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as    | 2 +-
 .../org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as | 5 ++---
 .../org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as   | 5 ++---
 .../src/main/royale/org/apache/royale/jewel/beads/views/ListView.as | 6 +-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index b864e17..fd63ad2 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -233,7 +233,7 @@ package org.apache.royale.core
                {
                        super.addedToParent();
                        
-                       if (itemRendererParent.host is IEmphasis && 
(itemRendererParent.host as IEmphasis).emphasis)
+                       if (itemRendererParent && itemRendererParent.host is 
IEmphasis && (itemRendererParent.host as IEmphasis).emphasis)
                        {
                                emphasis = (itemRendererParent.host as 
IEmphasis).emphasis;
                        } else
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
index e56807b..88c3044 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleHorizontalLayout.as
@@ -18,16 +18,15 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.layouts
 {
-       COMPILE::JS 
+       COMPILE::SWF
        {
-       import org.apache.royale.core.UIBase;
-       }
        import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
        import org.apache.royale.core.ILayoutChild;
        import org.apache.royale.core.ILayoutView;
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.core.ValuesManager;
        import org.apache.royale.core.layout.EdgeData;
+       }
        import org.apache.royale.events.Event;
        import org.apache.royale.jewel.beads.layouts.StyledLayoutBase;
 
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
index 938cc6b..6250dc6 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/SimpleVerticalLayout.as
@@ -18,16 +18,15 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.layouts
 {
-       COMPILE::JS
+       COMPILE::SWF
        {
-               import org.apache.royale.core.UIBase;
-       }
        import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
        import org.apache.royale.core.ILayoutChild;
        import org.apache.royale.core.ILayoutView;
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.core.ValuesManager;
        import org.apache.royale.core.layout.EdgeData;
+       }
        import org.apache.royale.events.Event;
        import org.apache.royale.jewel.beads.layouts.StyledLayoutBase;
 
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index 04f9a08..d8ad7e8 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -18,10 +18,6 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-       COMPILE::JS
-       {
-       import org.apache.royale.events.IEventDispatcher;
-       }
        import org.apache.royale.core.IItemRendererParent;
        import org.apache.royale.core.ILayoutView;
        import org.apache.royale.core.IRollOverModel;
@@ -94,7 +90,7 @@ package org.apache.royale.jewel.beads.views
                        listModel = _strand.getBeadByType(ISelectionModel) as 
ISelectionModel;
                        listModel.addEventListener("selectionChanged", 
selectionChangeHandler);
                        listModel.addEventListener("rollOverIndexChanged", 
rollOverIndexChangeHandler);
-                       
IEventDispatcher(_strand).addEventListener("itemsCreated", itemsCreatedHandler);
+                       listenOnStrand("itemsCreated", itemsCreatedHandler);
 
                        super.handleInitComplete(event);
                }