You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/12 11:00:38 UTC

[royale-asjs] branch develop updated: Don’t escape ampersands that preceed pound

This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 629941d  Don’t escape ampersands that preceed pound
629941d is described below

commit 629941d7508d43b0b2a85a89e1caf43a0081b7d8
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Sep 12 14:00:29 2018 +0300

    Don’t escape ampersands that preceed pound
---
 frameworks/projects/XML/src/main/royale/XML.as | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/XML/src/main/royale/XML.as b/frameworks/projects/XML/src/main/royale/XML.as
index b9e8694..3004e2a 100644
--- a/frameworks/projects/XML/src/main/royale/XML.as
+++ b/frameworks/projects/XML/src/main/royale/XML.as
@@ -138,7 +138,10 @@ package
 						outArr[i] = "&lt;";
 						break;
 					case "&":
-						outArr[i] = "&amp;";
+						if(arr[i+1] == "#")
+							outArr[i] = "&";
+						else
+							outArr[i] = "&amp;";
 						break;
 					case '"':
 						outArr[i] = "&quot;";
@@ -176,7 +179,10 @@ package
 						outArr[i] = "&gt;";
 						break;
 					case "&":
-						outArr[i] = "&amp;";
+						if(arr[i+1] == "#")
+							outArr[i] = "&";
+						else
+							outArr[i] = "&amp;";
 						break;
 					default:
 						outArr[i] = arr[i];