You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pu...@apache.org on 2021/09/20 12:39:28 UTC
[royale-asjs] branch develop updated (af04e6f -> 47c308a)
This is an automated email from the ASF dual-hosted git repository.
pushminakazi pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from af04e6f Merge pull request #1127 from estanglerbm/various-small-changes-jan-2021
add 550f1c2 Flex has become a TLP
add caa9ed5 merge flexjs 0.5.0 from develop to master
add 2766a71 Merge to master from develop tag 'apache-flex-flexjs-0.6.0'
add c9199c6 Merge branch 'release0.7.0'
add ad7aade Merge branch 'release0.8.0'
add 6242e58 Merge tag 'apache-royale-0.9.0'
add 1780c90 Merge tag 'apache-royale-0.9.1'
add 5a39edd Merge tag 'apache-royale-0.9.2'
add c2ea406 Merge tag 'apache-royale-0.9.4'
add 7136c0a Merge tag 'apache-royale-0.9.6'
add dc73ff2 Merge tag 'apache-royale-0.9.7'
add a2b6969 Merge tag 'apache-royale-0.9.8'
new c2e6a0f Merge branch 'master' of https://github.com/apache/royale-asjs into develop
new 47c308a Revert get Stage in SystemManager.as and ISystemManager.as to make mxtests works
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as | 4 ++--
.../projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
[royale-asjs] 01/02: Merge branch 'master' of
https://github.com/apache/royale-asjs into develop
Posted by pu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pushminakazi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit c2e6a0f85aadbee008610c9c7d7f0eaae89c2ba5
Merge: af04e6f a2b6969
Author: pashminakazi <pa...@gmail.com>
AuthorDate: Mon Sep 20 05:29:57 2021 -0700
Merge branch 'master' of https://github.com/apache/royale-asjs into develop
[royale-asjs] 02/02: Revert get Stage in SystemManager.as and
ISystemManager.as to make mxtests works
Posted by pu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pushminakazi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 47c308a1f73f5f3fbb724ae63dda08f460187012
Author: pashminakazi <pa...@gmail.com>
AuthorDate: Mon Sep 20 05:38:50 2021 -0700
Revert get Stage in SystemManager.as and ISystemManager.as to make mxtests works
---
.../projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as | 4 ++--
.../projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
index a73d398..213fd8d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
@@ -104,12 +104,12 @@ public interface ISystemManager extends IEventDispatcher, IChildList /*, IFlexMo
function get rawChildren():IChildList;
function get numModalWindows():int;
function set numModalWindows(value:int):void;
- COMPILE::SWF {
+ /* COMPILE::SWF {
function get stage():Stage;
}
COMPILE::JS {
function get stage():Object;
- }
+ } */
//--------------------------------------------------------------------------
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 7dbe3e5..3976e01 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
@@ -516,7 +516,7 @@ public class SystemManager extends SystemManagerBase implements ISystemManager,
* get the main stage if we're loaded into another swf in the same sandbox
*/
- COMPILE::JS {
+ /* COMPILE::JS {
public function get stage():Object
{
return null;
@@ -528,7 +528,8 @@ public class SystemManager extends SystemManagerBase implements ISystemManager,
{
return null;
}
- }
+ } */
+
/* override public function get stage():Stage
{
if (_stage)