From 753bf64e8a4d9cb6ce0dfd16d89b0be278cdafbe Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 12 Jan 2015 14:18:39 -0800
Subject: [PATCH 1/3] * Fixed: DZI tilesource was broken

---
 src/dzitilesource.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/dzitilesource.js b/src/dzitilesource.js
index eb283fab..99dd92d1 100644
--- a/src/dzitilesource.js
+++ b/src/dzitilesource.js
@@ -107,8 +107,10 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, /** @lends OpenSead
         var ns;
         if ( data.Image ) {
             ns = data.Image.xmlns;
-        } else if ( data.documentElement && "Image" == data.documentElement.localName ) {
-            ns = data.documentElement.namespaceURI;
+        } else if ( data.documentElement) {
+            if ("Image" == data.documentElement.localName || "Image" == data.documentElement.tagName) {
+                ns = data.documentElement.namespaceURI;
+            }
         }
 
         return ( "http://schemas.microsoft.com/deepzoom/2008" == ns ||
@@ -221,7 +223,7 @@ function configureFromXML( tileSource, xmlDoc ){
     }
 
     var root           = xmlDoc.documentElement,
-        rootName       = root.localName,
+        rootName       = root.localName || root.tagName,
         ns             = xmlDoc.documentElement.namespaceURI,
         configuration  = null,
         displayRects   = [],
@@ -234,7 +236,10 @@ function configureFromXML( tileSource, xmlDoc ){
     if ( rootName == "Image" ) {
 
         try {
-            sizeNode = root.getElementsByTagNameNS(ns, "Size" )[ 0 ];
+            sizeNode = root.getElementsByTagName("Size" )[ 0 ];
+            if (sizeNode === undefined) {
+                sizeNode = root.getElementsByTagNameNS(ns, "Size" )[ 0 ];
+            }
 
             configuration = {
                 Image: {
@@ -257,11 +262,17 @@ function configureFromXML( tileSource, xmlDoc ){
                 );
             }
 
-            dispRectNodes = root.getElementsByTagNameNS(ns, "DisplayRect" );
+            dispRectNodes = root.getElementsByTagName("DisplayRect" );
+            if (dispRectNodes === undefined) {
+                dispRectNodes = root.getElementsByTagNameNS(ns, "DisplayRect" )[ 0 ];
+            }
 
             for ( i = 0; i < dispRectNodes.length; i++ ) {
                 dispRectNode = dispRectNodes[ i ];
-                rectNode     = dispRectNode.getElementsByTagNameNS(ns, "Rect" )[ 0 ];
+                rectNode     = dispRectNode.getElementsByTagName("Rect" )[ 0 ];
+                if (rectNode === undefined) {
+                    rectNode = dispRectNode.getElementsByTagNameNS(ns, "Rect" )[ 0 ];
+                }
 
                 displayRects.push({
                     Rect: {

From 00edbe565a40cb192bda753d1d7807571cf0c82a Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 12 Jan 2015 14:21:57 -0800
Subject: [PATCH 2/3] Changelog for #563

---
 changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.txt b/changelog.txt
index f9a8cda9..903e3062 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@ OPENSEADRAGON CHANGELOG
 1.2.1: (in progress)
 
 * Added preserveOverlays option (#561)
+* Fixed: DZI tilesource was broken (#563)
 
 1.2.0:
 

From 83b7d7597ac7c74422d23f16c94ad2dc287db15c Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 12 Jan 2015 14:22:10 -0800
Subject: [PATCH 3/3] Added a note about preserveOverlays

---
 src/openseadragon.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/openseadragon.js b/src/openseadragon.js
index e1a37e2f..27d3262c 100644
--- a/src/openseadragon.js
+++ b/src/openseadragon.js
@@ -515,15 +515,17 @@
   *
   * @property {Boolean} [preserveViewport=false]
   *     If the viewer has been configured with a sequence of tile sources, then
-  *     normally navigating to through each image resets the viewport to 'home'
+  *     normally navigating through each image resets the viewport to 'home'
   *     position.  If preserveViewport is set to true, then the viewport position
   *     is preserved when navigating between images in the sequence.
   *
   * @property {Boolean} [preserveOverlays=false]
   *     If the viewer has been configured with a sequence of tile sources, then
-  *     normally navigating to through each image resets the overlays.
+  *     normally navigating through each image resets the overlays.
   *     If preserveOverlays is set to true, then the overlays
   *     are preserved when navigating between images in the sequence.
+  *     Note: setting preserveOverlays overrides any overlays specified in the
+  *     "overlays" property.
   *
   * @property {Boolean} [showReferenceStrip=false]
   *     If the viewer has been configured with a sequence of tile sources, then