mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-26 15:16:10 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 9 BUILD_MINOR: 9
BUILD_ID: 25 BUILD_ID: 26
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

14
openseadragon.js
View File

@ -1,5 +1,5 @@
/** /**
* @version OpenSeadragon 0.9.25 * @version OpenSeadragon 0.9.26
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -3602,6 +3602,12 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
'class', 'class',
this.toolbar.element.className.replace('fullpage','') 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 ); body.removeChild( this.container );
@ -3609,12 +3615,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
for ( i = 0; i < nodes; i++ ){ for ( i = 0; i < nodes; i++ ){
body.appendChild( this.previousBody.shift() ); 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.element.appendChild( this.container );
THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element ); THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element );

12
src/viewer.js
View File

@ -635,6 +635,12 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
'class', 'class',
this.toolbar.element.className.replace('fullpage','') 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 ); body.removeChild( this.container );
@ -642,12 +648,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
for ( i = 0; i < nodes; i++ ){ for ( i = 0; i < nodes; i++ ){
body.appendChild( this.previousBody.shift() ); 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.element.appendChild( this.container );
THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element ); THIS[ this.hash ].prevContainerSize = $.getElementSize( this.element );