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 33db829 Fixed #123
33db829 is described below
commit 33db8295b8a007118087ee672b093a5c2f0abb26
Author: Harbs <[email protected]>
AuthorDate: Tue Feb 20 14:54:29 2018 +0200
Fixed #123
---
frameworks/projects/XML/src/main/royale/XML.as | 8 ++++++-
manualtests/XMLTest/src/MyInitialView.mxml | 30 ++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/XML/src/main/royale/XML.as
b/frameworks/projects/XML/src/main/royale/XML.as
index b13fada..60b95ae 100644
--- a/frameworks/projects/XML/src/main/royale/XML.as
+++ b/frameworks/projects/XML/src/main/royale/XML.as
@@ -222,7 +222,13 @@ package
var xml:XML;
var i:int;
var data:* = node.nodeValue;
- var qname:QName = getQName(node.nodeName, node.prefix,
node.namespaceURI,false);
+ var localName:String = node.nodeName;
+ var prefix:String = node.prefix;
+ if(prefix && localName.indexOf(prefix + ":") == 0)
+ {
+ localName = localName.substr(prefix.length+1);
+ }
+ var qname:QName = getQName(localName, prefix,
node.namespaceURI,false);
switch(node.nodeType)
{
case 1:
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml
b/manualtests/XMLTest/src/MyInitialView.mxml
index 1e42c42..84042df 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -167,6 +167,36 @@ limitations under the License.
var contentStr:String = content.toXMLString();
var correctStr:String = '<root><content><![CDATA[<?xpacket begin=""
id="W5M0MpCehiHzreSzNTczkc9d"?><x:xmpmeta xmlns:x="adobe:ns:meta/"
x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
<rdf:Description rdf:about=""/> </rdf:RDF></x:xmpmeta><?xpacket
end="r"?>]'+']></content></root>';
trace("content with cdata works? " + (contentStr == correctStr));
+content = <Document>
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011
66.145661, 2012/02/06-14:56:27 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/";
rdf:about="">
+ <dc:format>application/x-indesign</dc:format>
+ </rdf:Description>
+ <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/";
xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"; rdf:about="">
+ <xmp:CreatorTool>Adobe InDesign CS6 (Windows)</xmp:CreatorTool>
+ <xmp:CreateDate>2018-02-19T09:17:41Z</xmp:CreateDate>
+ <xmp:MetadataDate>2018-02-19T09:17:41Z</xmp:MetadataDate>
+ <xmp:ModifyDate>2018-02-19T09:17:41Z</xmp:ModifyDate>
+ <xmp:Thumbnails>
+ <rdf:Alt>
+ <rdf:li rdf:parseType="Resource">
+ <xmpGImg:format>JPEG</xmpGImg:format>
+ <xmpGImg:width>512</xmpGImg:width>
+ <xmpGImg:height>512</xmpGImg:height>
+ <xmpGImg:image>FOO</xmpGImg:image>
+ </rdf:li>
+ </rdf:Alt>
+ </xmp:Thumbnails>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="r"?>
+</Document>;
+contentStr = content.toXMLString();
+trace("have x prefix? " + (contentStr.indexOf("x:xmptk") != -1));
+trace("have double x prefix? (should be false) " +
(contentStr.indexOf("x:x:xmptk") != -1));
var xmlString:String = xml.toXMLString();
var script:XML = xml..script[0].children()[0];
var kind:String = script.nodeKind();
--
To stop receiving notification emails like this one, please contact
[email protected].
