You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/03/21 19:55:00 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - don't emit
relativeTo unless non-null
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 <ah...@apache.org>
Authored: Fri Mar 21 08:18:05 2014 -0700
Committer: Alex Harui <ah...@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;
}
[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix baseline
Posted by ah...@apache.org.
fix baseline
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3c27b0f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3c27b0f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3c27b0f8
Branch: refs/heads/develop
Commit: 3c27b0f8132cffb1a1420cb62b490737f2b5a71d
Parents: 12f338c
Author: Alex Harui <ah...@apache.org>
Authored: Fri Mar 21 11:54:43 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Mar 21 11:54:43 2014 -0700
----------------------------------------------------------------------
compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3c27b0f8/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index 55cf7f3..6b68a21 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -197,7 +197,7 @@ MyInitialView.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyInitialView', q
/**
* @private
- * @type {org.apache.flex.utils.org.apache.flex.utils.Timer}
+ * @type {org.apache.flex.utils.Timer}
*/
MyInitialView.prototype.timer;