You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2019/11/01 03:19:42 UTC

[royale-asjs] 04/05: proxy display object 'contains' emulation via native DOM node 'contains'

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

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 43bf108bdbdc71d963f406588b0249e5f181948d
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Nov 1 15:30:29 2019 +1300

    proxy display object 'contains' emulation via native DOM node 'contains'
---
 .../MXRoyale/src/main/royale/mx/core/UIComponent.as         | 11 +----------
 .../MXRoyale/src/main/royale/mx/managers/SystemManager.as   | 13 ++-----------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 85ea26d..54d1482 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -3477,16 +3477,7 @@ COMPILE::JS
         }
         COMPILE::JS
         {
-            var children:NodeList = element.childNodes;
-            var n:int = children.length;
-            var e:Object = child.element;
-            
-            for (var i:int = 0; i < n; i++)
-            {
-                if (children[i] == e)
-                    return true;
-            }
-            return false;
+            return element.contains(child.element);
         }
     }
     
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
index b9d7665..7b56f6d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
@@ -96,7 +96,7 @@ import org.apache.royale.core.IPopUpHost;
 import org.apache.royale.core.IPopUpHostParent;
 import org.apache.royale.core.IUIBase;
 import org.apache.royale.events.IEventDispatcher;
-import org.apache.royale.geom.Rectangle;
+import org.apache.royale.geom.Rectangle;
 
 //--------------------------------------
 //  Events
@@ -3722,16 +3722,7 @@ public class SystemManager extends SystemManagerBase implements ISystemManager,
         }
         COMPILE::JS
         {
-            var children:NodeList = element.childNodes;
-            var n:int = children.length;
-            var e:Object = child.element;
-            
-            for (var i:int = 0; i < n; i++)
-            {
-                if (children[i] == e)
-                    return true;
-            }
-            return false;
+            return element.contains(child.element);
         }
     }