flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [3/3] git commit: [flex-falcon] [refs/heads/develop] - fx:Components were messing up the sameClass test
Date Tue, 05 May 2015 20:00:10 GMT
fx:Components were messing up the sameClass test


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

Branch: refs/heads/develop
Commit: 2d716fabf94a92e9b4e7a327bf9379208f234f25
Parents: bfe2c8e
Author: Alex Harui <aharui@apache.org>
Authored: Tue May 5 13:00:00 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue May 5 13:00:00 2015 -0700

----------------------------------------------------------------------
 .../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d716fab/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 789fb2c..f7d9c55 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -267,6 +267,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
         classDefinition = cdef;
         IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker())
                 .getASEmitter();
+        IDefinition oldThisClass = ((JSFlexJSEmitter) asEmitter).thisClass;
         ((JSFlexJSEmitter) asEmitter).thisClass = cdef;
 
         IASNode classNode = node.getContainedClassDefinitionNode();
@@ -311,6 +312,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
         idCounter = oldIdCounter;
         inMXMLContent = oldInMXMLContent;
         classDefinition = oldClassDef;
+        ((JSFlexJSEmitter) asEmitter).thisClass = oldThisClass;
 
     }
 


Mime
View raw message