From 4ddab463e6949fb071671bb1281d704b1c76432d Mon Sep 17 00:00:00 2001 From: thatcher Date: Fri, 9 Mar 2012 21:44:14 -0500 Subject: [PATCH] error in restore from fullpagemode when toolbar option is not used. sorry, should have noticed... --- build.properties | 2 +- openseadragon.js | 14 +++++++------- src/viewer.js | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.properties b/build.properties index 7229889d..6716fb70 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ PROJECT: openseadragon BUILD_MAJOR: 0 BUILD_MINOR: 9 -BUILD_ID: 25 +BUILD_ID: 26 BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} diff --git a/openseadragon.js b/openseadragon.js index 3b0278d5..bfddd738 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -1,5 +1,5 @@ /** - * @version OpenSeadragon 0.9.25 + * @version OpenSeadragon 0.9.26 * * @fileOverview *

@@ -3602,6 +3602,12 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, 'class', this.toolbar.element.className.replace('fullpage','') ); + this.toolbar.parentNode.insertBefore( + this.toolbar.element, + this.toolbar.previousSibling + ); + delete this.toolbar.parentNode; + delete this.toolbar.previousSibling; } body.removeChild( this.container ); @@ -3609,12 +3615,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, for ( i = 0; i < nodes; i++ ){ body.appendChild( this.previousBody.shift() ); } - this.toolbar.parentNode.insertBefore( - this.toolbar.element, - this.toolbar.previousSibling - ); - delete this.toolbar.parentNode; - delete this.toolbar.previousSibling; this.element.appendChild( this.container ); THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element ); diff --git a/src/viewer.js b/src/viewer.js index 60d8245f..04b24480 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -635,6 +635,12 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, 'class', this.toolbar.element.className.replace('fullpage','') ); + this.toolbar.parentNode.insertBefore( + this.toolbar.element, + this.toolbar.previousSibling + ); + delete this.toolbar.parentNode; + delete this.toolbar.previousSibling; } body.removeChild( this.container ); @@ -642,12 +648,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, for ( i = 0; i < nodes; i++ ){ body.appendChild( this.previousBody.shift() ); } - this.toolbar.parentNode.insertBefore( - this.toolbar.element, - this.toolbar.previousSibling - ); - delete this.toolbar.parentNode; - delete this.toolbar.previousSibling; this.element.appendChild( this.container ); THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element );