Merge branch 'master' of github.com:openseadragon/openseadragon

This commit is contained in:
Ian Gilman 2014-08-21 10:12:44 -07:00
commit 984cc79cc6

View File

@ -222,6 +222,7 @@ function configureFromXML( tileSource, xmlDoc ){
var root = xmlDoc.documentElement,
rootName = root.localName,
ns = xmlDoc.documentElement.namespaceURI,
configuration = null,
displayRects = [],
dispRectNodes,
@ -233,7 +234,8 @@ function configureFromXML( tileSource, xmlDoc ){
if ( rootName == "Image" ) {
try {
sizeNode = root.getElementsByTagName( "Size" )[ 0 ];
sizeNode = root.getElementsByTagNameNS(ns, "Size" )[ 0 ];
configuration = {
Image: {
xmlns: "http://schemas.microsoft.com/deepzoom/2008",
@ -255,10 +257,11 @@ function configureFromXML( tileSource, xmlDoc ){
);
}
dispRectNodes = root.getElementsByTagName( "DisplayRect" );
dispRectNodes = root.getElementsByTagNameNS(ns, "DisplayRect" );
for ( i = 0; i < dispRectNodes.length; i++ ) {
dispRectNode = dispRectNodes[ i ];
rectNode = dispRectNode.getElementsByTagName( "Rect" )[ 0 ];
rectNode = dispRectNode.getElementsByTagNameNS(ns, "Rect" )[ 0 ];
displayRects.push({
Rect: {