mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-16 14:53:14 +03:00
Code Issues Projects Releases Wiki Activity

More cleanup for open() changes

Browse Source
This commit is contained in:
Ian Gilman 2014-10-29 16:39:43 -07:00
parent 95836a6ad1
commit 4d6be50c05
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/navigator.js
View File

@ -252,6 +252,8 @@ $.Navigator = function( options ){
} }
} }
}); });
this.update(viewer.viewport);
}; };
$.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /** @lends OpenSeadragon.Navigator.prototype */{ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /** @lends OpenSeadragon.Navigator.prototype */{
@ -323,21 +325,21 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
if( viewport && this.viewport ) { if( viewport && this.viewport ) {
bounds = viewport.getBounds( true ); bounds = viewport.getBounds( true );
topleft = this.viewport.pixelFromPoint( bounds.getTopLeft(), false ); topleft = this.viewport.pixelFromPoint( bounds.getTopLeft(), false );
bottomright = this.viewport.pixelFromPoint( bounds.getBottomRight(), false ).minus( this.totalBorderWidths ); bottomright = this.viewport.pixelFromPoint( bounds.getBottomRight(), false )
.minus( this.totalBorderWidths );
//update style for navigator-box //update style for navigator-box
(function(style) { var style = this.displayRegion.style;
style.display = this.world.getItemCount() ? 'block' : 'none';
style.top = Math.round( topleft.y ) + 'px'; style.top = Math.round( topleft.y ) + 'px';
style.left = Math.round( topleft.x ) + 'px'; style.left = Math.round( topleft.x ) + 'px';
var width = Math.abs( topleft.x - bottomright.x ); var width = Math.abs( topleft.x - bottomright.x );
var height = Math.abs( topleft.y - bottomright.y ); var height = Math.abs( topleft.y - bottomright.y );
// make sure width and height are non-negative so IE doesn't throw // make sure width and height are non-negative so IE doesn't throw
style.width = Math.round( Math.max( width, 0 ) ) + 'px'; style.width = Math.round( Math.max( width, 0 ) ) + 'px';
style.height = Math.round( Math.max( height, 0 ) ) + 'px'; style.height = Math.round( Math.max( height, 0 ) ) + 'px';
}( this.displayRegion.style ));
} }
}, },

6
src/viewer.js
View File

@ -745,7 +745,6 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
* @fires OpenSeadragon.Viewer.event:close * @fires OpenSeadragon.Viewer.event:close
*/ */
close: function ( ) { close: function ( ) {
if ( !THIS[ this.hash ] ) { if ( !THIS[ this.hash ] ) {
//this viewer has already been destroyed: returning immediately //this viewer has already been destroyed: returning immediately
return this; return this;
@ -791,6 +790,11 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
* @function * @function
*/ */
destroy: function( ) { destroy: function( ) {
if ( !THIS[ this.hash ] ) {
//this viewer has already been destroyed: returning immediately
return;
}
this.close(); this.close();
//TODO: implement this... //TODO: implement this...