error in restore from fullpagemode when toolbar option is not used. sorry, should have noticed...

This commit is contained in:
thatcher 2012-03-09 21:44:14 -05:00
parent 4b81b64fc6
commit 4ddab463e6
3 changed files with 14 additions and 14 deletions

View File

@ -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}

View File

@ -1,5 +1,5 @@
/**
* @version OpenSeadragon 0.9.25
* @version OpenSeadragon 0.9.26
*
* @fileOverview
* <h2>
@ -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 );

View File

@ -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 );