This is an automated email from the ASF dual-hosted git repository. harbs pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit dd4126f310a8ab247bfa517f58ecad4b18ae34ab Author: Harbs <[email protected]> AuthorDate: Tue Dec 24 10:01:34 2019 +0200 Cleaned up Crux --- .../projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as | 2 -- .../src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as | 7 ++++--- .../org/apache/royale/crux/utils/view/applicationContains.as | 6 +++--- .../royale/org/apache/royale/crux/utils/view/containerContains.as | 4 +--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as index 1e19c72..0836fa4 100644 --- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as +++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/Crux.as @@ -25,7 +25,6 @@ package org.apache.royale.crux import org.apache.royale.reflection.ExtraData; COMPILE::JS { - import org.apache.royale.core.HTMLElementWrapper; import org.apache.royale.core.WrappedHTMLElement; } @@ -76,7 +75,6 @@ package org.apache.royale.crux * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.4 - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper * @royaleignorecoercion org.apache.royale.events.IEventDispatcher */ public function set strand(value:IStrand):void diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as index 9ab96f0..5418d86 100644 --- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as +++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/beads/JSStageEvents.as @@ -30,7 +30,7 @@ package org.apache.royale.crux.beads import org.apache.royale.core.UIBase; COMPILE::JS { - import org.apache.royale.core.HTMLElementWrapper; + import org.apache.royale.core.ElementWrapper; import org.apache.royale.core.WrappedHTMLElement; import goog.events.EventTarget; } @@ -95,7 +95,8 @@ package org.apache.royale.crux.beads * @playerversion AIR 2.6 * @productversion Royale 0.9.6 * - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper + * @royaleignorecoercion org.apache.royale.core.ElementWrapper + * @royaleignorecoercion org.apache.royale.events.IEventDispatcher */ public function set strand(value:IStrand):void { @@ -108,7 +109,7 @@ package org.apache.royale.crux.beads _activeInstance = this; if (!_dispatcher) _dispatcher = value as IEventDispatcher; var observer:MutationObserver = new MutationObserver(mutationDetected); - observer.observe(HTMLElementWrapper(value).element, {'childList': true, 'subtree': true}); + observer.observe((value as ElementWrapper).element, {'childList': true, 'subtree': true}); trace('Activating JSStageEvents') } } diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as index 73b5cc1..446a29f 100644 --- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as +++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/applicationContains.as @@ -31,7 +31,7 @@ package org.apache.royale.crux.utils.view { } COMPILE::JS{ - import org.apache.royale.core.HTMLElementWrapper; + import org.apache.royale.core.ElementWrapper; } @@ -42,7 +42,7 @@ package org.apache.royale.crux.utils.view { * @param content * @return true if the content is present in the child hierarchy of the container * - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper + * @royaleignorecoercion org.apache.royale.core.ElementWrapper */ public function applicationContains(container:IFlexInfo, content:UIBase):Boolean { if (!content) return false; @@ -52,7 +52,7 @@ package org.apache.royale.crux.utils.view { } COMPILE::JS{ - return HTMLElementWrapper(container).element.contains(content.element) + return (container as ElementWrapper).element.contains(content.element) } } diff --git a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as index 283c53b..67a1de1 100644 --- a/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as +++ b/frameworks/projects/Crux/src/main/royale/org/apache/royale/crux/utils/view/containerContains.as @@ -31,7 +31,6 @@ package org.apache.royale.crux.utils.view { } COMPILE::JS{ - import org.apache.royale.core.HTMLElementWrapper; } /** @@ -41,7 +40,6 @@ package org.apache.royale.crux.utils.view { * @param content * @return true if the content is present in the child hierarchy of the container * - * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper */ public function containerContains(container:ContainerBase, content:UIBase):Boolean { if (!content) return false; @@ -51,7 +49,7 @@ package org.apache.royale.crux.utils.view { } COMPILE::JS{ - return HTMLElementWrapper(container).element.contains(HTMLElementWrapper(content).element); + return container.element.contains(content.element); } }
