You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/02/16 12:27:47 UTC
[1/4] git commit: [flex-asjs] [refs/heads/e4x] - intellij-config.xml:
updated paths to manifests to match frameworks/projects/flex-config.xml
Repository: flex-asjs
Updated Branches:
refs/heads/e4x c7fd667c8 -> 3872cb8e1
intellij-config.xml: updated paths to manifests to match frameworks/projects/flex-config.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8156e98b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8156e98b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8156e98b
Branch: refs/heads/e4x
Commit: 8156e98b355df265954692625d76883389168182
Parents: 4d0f00f
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri Feb 12 09:36:36 2016 -0800
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri Feb 12 09:36:36 2016 -0800
----------------------------------------------------------------------
ide/IDEA/intellij-config.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8156e98b/ide/IDEA/intellij-config.xml
----------------------------------------------------------------------
diff --git a/ide/IDEA/intellij-config.xml b/ide/IDEA/intellij-config.xml
index 42ff4d4..e472ee4 100644
--- a/ide/IDEA/intellij-config.xml
+++ b/ide/IDEA/intellij-config.xml
@@ -49,18 +49,18 @@
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <manifest>../../frameworks/projects/Core/basic-manifest.xml</manifest>
+ <manifest>../../frameworks/projects/Core/src/main/resources/basic-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/flexjs/html5</uri>
- <manifest>../../frameworks/projects/HTML5/html5-manifest.xml</manifest>
+ <manifest>../../frameworks/projects/HTML5/src/main/resources/html5-manifest.xml</manifest>
</namespace>
<namespace>
<uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>../../frameworks/projects/HTML/svg-manifest.xml</manifest>
+ <manifest>../../frameworks/projects/HTML/src/main/resources/svg-manifest.xml</manifest>
</namespace>
</namespaces>
[2/4] git commit: [flex-asjs] [refs/heads/e4x] - trace(): better
detection of window.console() so that there isn't a runtime error in a
Node.js release build
Posted by ha...@apache.org.
trace(): better detection of window.console() so that there isn't a runtime error in a Node.js release build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9afa2c11
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9afa2c11
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9afa2c11
Branch: refs/heads/e4x
Commit: 9afa2c111e92953c94c9adab10540890252a1f49
Parents: 8156e98
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri Feb 12 11:07:27 2016 -0800
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri Feb 12 11:07:27 2016 -0800
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/utils/Language.as | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9afa2c11/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
index 6a26191..e3a318c 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
@@ -308,10 +308,9 @@ package org.apache.flex.utils
if (theConsole === undefined)
{
- var windowConsole:* = window.console;
- if (windowConsole !== undefined)
+ if(typeof window !== "undefined")
{
- theConsole = windowConsole;
+ theConsole = window.console;
}
}
[3/4] git commit: [flex-asjs] [refs/heads/e4x] - Core: Language now
checks for global console variable as final fallback,
which adds trace() support for Node.js release builds
Posted by ha...@apache.org.
Core: Language now checks for global console variable as final fallback, which adds trace() support for Node.js release builds
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/59b8e43f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/59b8e43f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/59b8e43f
Branch: refs/heads/e4x
Commit: 59b8e43f7e1edad135f77518127f8f3fa51cd6e6
Parents: 9afa2c1
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri Feb 12 11:29:26 2016 -0800
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri Feb 12 11:29:26 2016 -0800
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/utils/Language.as | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/59b8e43f/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
index e3a318c..2586e77 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Language.as
@@ -312,6 +312,10 @@ package org.apache.flex.utils
{
theConsole = window.console;
}
+ else if(typeof console !== "undefined")
+ {
+ theConsole = console;
+ }
}
try
[4/4] git commit: [flex-asjs] [refs/heads/e4x] - Merge branch
'develop' into e4x
Posted by ha...@apache.org.
Merge branch 'develop' into e4x
* develop:
Core: Language now checks for global console variable as final fallback, which adds trace() support for Node.js release builds
trace(): better detection of window.console() so that there isn't a runtime error in a Node.js release build
intellij-config.xml: updated paths to manifests to match frameworks/projects/flex-config.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3872cb8e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3872cb8e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3872cb8e
Branch: refs/heads/e4x
Commit: 3872cb8e1cb41316fa553d07ca3f1232e7a4f838
Parents: c7fd667 59b8e43
Author: Harbs <ha...@in-tools.com>
Authored: Tue Feb 16 13:27:40 2016 +0200
Committer: Harbs <ha...@in-tools.com>
Committed: Tue Feb 16 13:27:40 2016 +0200
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/utils/Language.as | 9 ++++++---
ide/IDEA/intellij-config.xml | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------