ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix XML serialize and xml_eql in IE9

Browse Source 
Use the xml property instead in IE for serializing XML.
The xml_eql tests were failing in IE9 on a difference between null and an
empty string for namespaceURI of attributes, this difference is not
relevant to our testing so make sure we ignore.
This commit is contained in:
Bart van den Eijnden
2013-05-24 10:53:29 +02:00
parent f8ef902af4
commit d8232bb484
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/parser/xml.js
View File

@@ -256,7 +256,9 @@ ol.parser.XML.prototype.setAttributeNS = function(node, uri, name, value) {
* @return {string} The serialized XML string. * @return {string} The serialized XML string.
*/ */
ol.parser.XML.prototype.serialize = function(node) { ol.parser.XML.prototype.serialize = function(node) {
if (node.nodeType == 1) { if (this.xmldom) {
return node.xml;
} else if (node.nodeType == 1) {
// Add nodes to a document before serializing. Everything else // Add nodes to a document before serializing. Everything else
// is serialized as is. This is also needed to get all namespaces // is serialized as is. This is also needed to get all namespaces
// defined in some browsers such as Chrome (xmlns attributes). // defined in some browsers such as Chrome (xmlns attributes).

13
test/expect-0.2.0-ol3/expect.js
View File

@@ -318,7 +318,18 @@
} }
// test attribute namespace // test attribute namespace
try { try {
expect(node1Attr[name].namespaceURI).to.equal(node2Attr[name].namespaceURI); var uri1 = node1Attr[name].namespaceURI;
var uri2 = node2Attr[name].namespaceURI;
// we do not care about the difference between an empty string and null for namespaceURI
// some tests will fail in IE9 otherwise
// see also http://msdn.microsoft.com/en-us/library/ff460650(v=vs.85).aspx
if (uri1 == '') {
uri1 = null;
}
if (uri2 == '') {
uri2 = null;
}
expect(uri1).to.equal(uri2);
} catch(e) { } catch(e) {
errors.push('namespaceURI attribute test failed for: ' + node1.nodeName + ' | ' + e.message); errors.push('namespaceURI attribute test failed for: ' + node1.nodeName + ' | ' + e.message);
} }