You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by yi...@apache.org on 2016/08/10 15:18:40 UTC
git commit: [flex-asjs] [refs/heads/refactor-sprite] - Make
Application an IPopUpHost
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite d4ec19568 -> 38f31c949
Make Application an IPopUpHost
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/38f31c94
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/38f31c94
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/38f31c94
Branch: refs/heads/refactor-sprite
Commit: 38f31c949e8a1505a783771089a9e5c10e64df01
Parents: d4ec195
Author: yishayw <yi...@hotmail.com>
Authored: Wed Aug 10 18:18:26 2016 +0300
Committer: yishayw <yi...@hotmail.com>
Committed: Wed Aug 10 18:18:26 2016 +0300
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/core/Application.as | 5 +++--
.../Core/src/main/flex/org/apache/flex/utils/UIUtils.as | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/38f31c94/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
index fe94e02..c7cc402 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
@@ -113,7 +113,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Application extends ApplicationBase implements IStrand, IParent, IEventDispatcher, ISWFApplication
+ public class Application extends ApplicationBase implements IStrand, IParent, IEventDispatcher, ISWFApplication, IPopUpHost
{
/**
* Constructor.
@@ -139,7 +139,8 @@ package org.apache.flex.core
COMPILE::SWF
public function setRoot(r:WrappedMovieClip):void
{
- element = r;
+ element = r;
+ element.flexjs_wrapper = this;
MouseEventConverter.setupAllConverters(r.stage);
MouseEventConverter.setupAllConverters(r.stage, false);
initHandler();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/38f31c94/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/UIUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/UIUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/UIUtils.as
index 2e14e12..da9c120 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/UIUtils.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/UIUtils.as
@@ -19,6 +19,7 @@
package org.apache.flex.utils
{
import org.apache.flex.core.IChild;
+ import org.apache.flex.core.IParent;
import org.apache.flex.core.IPopUpHost;
import org.apache.flex.core.IUIBase;
@@ -97,9 +98,9 @@ package org.apache.flex.utils
*/
public static function removePopUp(popUp:IChild):void
{
- var start:IUIBase = popUp.parent as IUIBase;
+ var start:IParent = popUp.parent;
while( start != null && !(start is IPopUpHost) && start is IChild ) {
- start = IChild(start).parent as IUIBase;
+ start = IChild(start).parent;
}
(start as IPopUpHost).removeElement(popUp);
}