Repository: flex-falcon Updated Branches: refs/heads/develop 5002a11e0 -> dffd83095
FLEX-35213 CDATA wasn't handling Windows newlines propertly Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dffd8309 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dffd8309 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dffd8309 Branch: refs/heads/develop Commit: dffd830953d0846cfd5090dba65903396126a889 Parents: 5002a11 Author: Alex Harui <[email protected]> Authored: Mon Dec 12 22:47:08 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Dec 12 22:47:08 2016 -0800 ---------------------------------------------------------------------- .../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dffd8309/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 7f40d3f..4bea612 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -2196,7 +2196,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements s = s.replace(ASEmitterTokens.SINGLE_QUOTE.getToken(), "\\" + ASEmitterTokens.SINGLE_QUOTE.getToken()); } - s = s.replace(ASEmitterTokens.NEW_LINE.getToken(), "\\n"); + s = s.replace("\r\n", "\\n"); + s = s.replace("\n", "\\n"); ps.value += s; if (ps.valueNeedsQuotes)
