Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 350442 - toXMLString omits namespace definition for attribute added with a namespace with an undefined prefix. r=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@208751 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jwalden%mit.edu
2006-08-29 21:10:54 +00:00
parent f328f8adfd
commit badb20705d
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mozilla/js/src/jsxml.c
View File

@@ -2784,31 +2784,6 @@ XMLToXMLString(JSContext *cx, JSXML *xml, const JSXMLArray *ancestorNSes,
* faster code and less data overhead.
*/
/* Step 17(c): append XML namespace declarations. */
for (i = 0, n = decls.length; i < n; i++) {
ns2 = XMLARRAY_MEMBER(&decls, i, JSXMLNamespace);
JS_ASSERT(ns2->declared);
js_AppendCString(&sb, " xmlns");
/* 17(c)(ii): NULL means *undefined* here. */
if (!ns2->prefix) {
prefix = GeneratePrefix(cx, ns2->uri, &ancdecls);
if (!prefix)
goto out;
ns2->prefix = prefix;
}
/* 17(c)(iii). */
if (!IS_EMPTY(ns2->prefix)) {
js_AppendChar(&sb, ':');
js_AppendJSString(&sb, ns2->prefix);
}
/* 17(d-g). */
AppendAttributeValue(cx, &sb, ns2->uri);
}
/* Step 17(b): append attributes. */
for (i = 0, n = xml->xml_attrs.length; i < n; i++) {
attr = XMLARRAY_MEMBER(&xml->xml_attrs, i, JSXML);
@@ -2854,6 +2829,31 @@ XMLToXMLString(JSContext *cx, JSXML *xml, const JSXMLArray *ancestorNSes,
AppendAttributeValue(cx, &sb, attr->xml_value);
}
/* Step 17(c): append XML namespace declarations. */
for (i = 0, n = decls.length; i < n; i++) {
ns2 = XMLARRAY_MEMBER(&decls, i, JSXMLNamespace);
JS_ASSERT(ns2->declared);
js_AppendCString(&sb, " xmlns");
/* 17(c)(ii): NULL means *undefined* here. */
if (!ns2->prefix) {
prefix = GeneratePrefix(cx, ns2->uri, &ancdecls);
if (!prefix)
goto out;
ns2->prefix = prefix;
}
/* 17(c)(iii). */
if (!IS_EMPTY(ns2->prefix)) {
js_AppendChar(&sb, ':');
js_AppendJSString(&sb, ns2->prefix);
}
/* 17(d-g). */
AppendAttributeValue(cx, &sb, ns2->uri);
}
/* Step 18: handle point tags. */
n = xml->xml_kids.length;
if (n == 0) {