From fd0d8d4507beff74bcb3d0634940045a1f9bb943 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Tue, 19 Aug 2014 13:47:51 -0400 Subject: [PATCH] always use getElementsByTagNameNS since it will work for DZI xml with or without ns prefix --- src/dzitilesource.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/dzitilesource.js b/src/dzitilesource.js index cc5fc5e1..eb283fab 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -234,11 +234,7 @@ function configureFromXML( tileSource, xmlDoc ){ if ( rootName == "Image" ) { try { - sizeNode = root.getElementsByTagName( "Size" )[ 0 ]; - // if finding by tag name failed, attempt to find with namespace - if (sizeNode === undefined) { - sizeNode = root.getElementsByTagNameNS(ns, "Size" )[ 0 ]; - } + sizeNode = root.getElementsByTagNameNS(ns, "Size" )[ 0 ]; configuration = { Image: { @@ -261,16 +257,11 @@ function configureFromXML( tileSource, xmlDoc ){ ); } - dispRectNodes = root.getElementsByTagName( "DisplayRect" ); - if (dispRectNodes.length === 0) { - dispRectNodes = root.getElementsByTagNameNS(ns, "DisplayRect" ); - } + dispRectNodes = root.getElementsByTagNameNS(ns, "DisplayRect" ); + for ( i = 0; i < dispRectNodes.length; i++ ) { dispRectNode = dispRectNodes[ i ]; - rectNode = dispRectNode.getElementsByTagName( "Rect" )[ 0 ]; - if (rectNode === undefined) { - rectNode = dispRectNode.getElementsByTagNameNS(ns, "Rect" )[ 0 ]; - } + rectNode = dispRectNode.getElementsByTagNameNS(ns, "Rect" )[ 0 ]; displayRects.push({ Rect: {