You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2014/11/21 13:17:40 UTC

[1/3] git commit: [flex-asjs] [refs/heads/develop] - Special case 'int' to 'INT' to avoid collision with build in JS 'class'

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 95059a74f -> 87a25c255


Special case 'int' to 'INT' to avoid collision with build in JS 'class'

Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87a25c25
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87a25c25
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87a25c25

Branch: refs/heads/develop
Commit: 87a25c255ab93ca192daca9de8eb4aa26a389c33
Parents: b5214af
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 21 13:17:23 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 21 13:17:30 2014 +0100

----------------------------------------------------------------------
 vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87a25c25/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
----------------------------------------------------------------------
diff --git a/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml b/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
index c1a2c99..fdd52d6 100755
--- a/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
+++ b/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
@@ -172,6 +172,9 @@
 					
 					clsMembers = parseClassMembers(clazz);
 					
+					if (clazz.qName === 'int') {
+						clazz.qName = 'INT';
+					}
 					clazz.startOutput();
 					
 					// Member stubs


[2/3] git commit: [flex-asjs] [refs/heads/develop] - Needed placeholder classes for these namespaces as well

Posted by er...@apache.org.
Needed placeholder classes for these namespaces as well

Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b5214afa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b5214afa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b5214afa

Branch: refs/heads/develop
Commit: b5214afa5ec7a8eca93e912222b84515653ac0ea
Parents: 0115447
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 21 13:16:45 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 21 13:17:30 2014 +0100

----------------------------------------------------------------------
 vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5214afa/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
----------------------------------------------------------------------
diff --git a/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml b/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
index 4b2a97c..c1a2c99 100755
--- a/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
+++ b/vf2js/utils/PlayerGlobalToJS/src/PlayerGlobalToJS.mxml
@@ -140,8 +140,10 @@
 			
 			parseClasses();
 			
-			// VERY special case
+			// namespace 'classes'
 			functions_['mx.core.mx_internal'] = 'mx.core.mx_internal';
+			functions_['mx.utils.object_proxy'] = 'mx.utils.object_proxy';
+			functions_['flashx.textLayout.tlf_internal'] = 'flashx.textLayout.tlf_internal';
 			
 			for (key in functions_) {
 				clazz = new Clazz(null);


[3/3] git commit: [flex-asjs] [refs/heads/develop] - Don't need ASDoc from 'TLF' either

Posted by er...@apache.org.
Don't need ASDoc from 'TLF' either

Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0115447a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0115447a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0115447a

Branch: refs/heads/develop
Commit: 0115447a5ab2fe3283383fc6e310342029febc99
Parents: 95059a7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Nov 21 13:16:08 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Nov 21 13:17:30 2014 +0100

----------------------------------------------------------------------
 vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0115447a/vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh
----------------------------------------------------------------------
diff --git a/vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh b/vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh
index 329b5eb..da909e1 100755
--- a/vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh
+++ b/vf2js/utils/FlexSDKToJS/TextLayoutToJS.sh
@@ -15,6 +15,7 @@ ARGS="$ARGS -ignore-problems=org.apache.flex.compiler.problems.DuplicateQNameInS
 ARGS="$ARGS -ignore-problems=org.apache.flex.compiler.problems.NoDefinitionForSWCDependencyProblem "
 
 ARGS="$ARGS -js-output-type=VF2JS "
+ARGS="$ARGS -keep-asdoc=false "
 
 ARGS="$ARGS -closure-lib="/Users/erik/Documents/ApacheFlex/dependencies/GoogleClosure/library" "