flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-falcon] [refs/heads/develop] - don't emit relativeTo unless non-null
Date Fri, 21 Mar 2014 18:55:00 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop d2119c68e -> 3c27b0f81


don't emit relativeTo unless non-null


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

Branch: refs/heads/develop
Commit: 12f338c0499b8d8fca2374e28d6e27ddcc7fbea3
Parents: d2119c6
Author: Alex Harui <aharui@apache.org>
Authored: Fri Mar 21 08:18:05 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Mar 21 08:18:05 2014 -0700

----------------------------------------------------------------------
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/12f338c0/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 f868b33..cd66409 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
@@ -1226,12 +1226,15 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
         pos.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + positionPropertyValue + ASEmitterTokens.SINGLE_QUOTE.getToken();
         addItems.propertySpecifiers.add(pos);
         
-        MXMLDescriptorSpecifier rel = new MXMLDescriptorSpecifier();
-        rel.isProperty = true;
-        rel.name = "relativeTo";
-        rel.parent = addItems;
-        rel.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + relativeToPropertyValue + ASEmitterTokens.SINGLE_QUOTE.getToken();
-        addItems.propertySpecifiers.add(rel);
+        if (relativeToPropertyValue != null)
+        {
+            MXMLDescriptorSpecifier rel = new MXMLDescriptorSpecifier();
+            rel.isProperty = true;
+            rel.name = "relativeTo";
+            rel.parent = addItems;
+            rel.value = ASEmitterTokens.SINGLE_QUOTE.getToken() + relativeToPropertyValue
+ ASEmitterTokens.SINGLE_QUOTE.getToken();
+            addItems.propertySpecifiers.add(rel);
+        }
         
         inStatesOverride = false;
     }


Mime
View raw message