From 197244e185226034ee43a9e6c823cf9acadaa4e9 Mon Sep 17 00:00:00 2001 From: Ventero Date: Fri, 28 Sep 2012 19:35:02 +0200 Subject: [PATCH] Allow different Deep Zoom XML namespaces. While the official XML namespace according to the xsd is http://schemas.microsoft.com/deepzoom/2008, DZIs generated with the Deep Zoom Composer use http://schemas.microsoft.com/deepzoom/2009, so this should be supported as well. --- openseadragon.js | 19 +++++++++---------- src/dzitilesource.js | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/openseadragon.js b/openseadragon.js index b002a24f..a492b3c7 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -5641,17 +5641,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, { * @param {String} optional - url */ supports: function( data, url ){ - return ( - data.Image && - "http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns - ) || ( - data.documentElement && - "Image" == data.documentElement.tagName && - "http://schemas.microsoft.com/deepzoom/2008" == - data.documentElement.namespaceURI - ); - }, + var ns; + if ( data.Image ) { + ns = data.Image.xmlns; + } else if ( data.documentElement && "Image" == data.documentElement.tagName ) { + ns = data.documentElement.namespaceURI; + } + return ( "http://schemas.microsoft.com/deepzoom/2008" == ns || + "http://schemas.microsoft.com/deepzoom/2009" == ns ); + }, /** * diff --git a/src/dzitilesource.js b/src/dzitilesource.js index b6f8db63..db8c7046 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -69,17 +69,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, { * @param {String} optional - url */ supports: function( data, url ){ - return ( - data.Image && - "http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns - ) || ( - data.documentElement && - "Image" == data.documentElement.tagName && - "http://schemas.microsoft.com/deepzoom/2008" == - data.documentElement.namespaceURI - ); - }, + var ns; + if ( data.Image ) { + ns = data.Image.xmlns; + } else if ( data.documentElement && "Image" == data.documentElement.tagName ) { + ns = data.documentElement.namespaceURI; + } + return ( "http://schemas.microsoft.com/deepzoom/2008" == ns || + "http://schemas.microsoft.com/deepzoom/2009" == ns ); + }, /** *