[royale-asjs] branch develop updated: Fixes runtime error for #432

[yishayw]

This is an automated email from the ASF dual-hosted git repository.

yishayw 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 fe5df41  Fixes runtime error for #432
fe5df41 is described below

commit fe5df4108341382b69ea6ff45c678662f3bda115
Author: DESKTOP-RH4S838\Yishay <yishayj...@hotmail.com>
AuthorDate: Mon Jul 22 10:30:47 2019 +0300

    Fixes runtime error for #432
---
 .../apache/royale/html/supportClasses/Viewport.as   | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
index b9bbbd0..43f2504 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
@@ -24,12 +24,13 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.core.IViewport;
        import org.apache.royale.core.UIBase;
-    import org.apache.royale.core.ValuesManager;
+       import org.apache.royale.core.ValuesManager;
        import org.apache.royale.events.Event;
-    import org.apache.royale.events.EventDispatcher;
-    import org.apache.royale.geom.Rectangle;
-    import org.apache.royale.geom.Size;
+       import org.apache.royale.events.EventDispatcher;
+       import org.apache.royale.geom.Rectangle;
+       import org.apache.royale.geom.Size;
        import org.apache.royale.utils.loadBeadFromValuesManager;
+
        COMPILE::SWF
        {
                import flash.geom.Rectangle;
@@ -83,7 +84,11 @@ package org.apache.royale.html.supportClasses
                public function set strand(value:IStrand):void
                {
                        _strand = value;
-            contentArea = loadBeadFromValuesManager(IContentView, 
"iContentView", _strand) as UIBase;
+                       var c:Class = ValuesManager.valuesImpl.getValue(value, 
"iContentView") as Class;
+                       if (c)
+                       {
+                               contentArea = new c() as UIBase;
+                       }
                }
                
                /**
@@ -95,7 +100,11 @@ package org.apache.royale.html.supportClasses
                {
                        _strand = value;
                        
-                       contentArea = loadBeadFromValuesManager(IContentView, 
"iContentView", _strand) as UIBase;
+                       var f:Function = 
ValuesManager.valuesImpl.getValue(value, "iContentView") as Function;
+                       if (f)
+                       {
+                               contentArea = new f() as UIBase;
+                       }
                        
                        if (!contentArea)
                                contentArea = value as UIBase;