mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-04-20 01:21:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge 26938ed10e into 8e36f9eead

Browse source
This commit is contained in:
pnorcross 2013-08-02 09:33:35 -07:00
commit 14b9d34713
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/viewer.js
View file

@ -1107,6 +1107,23 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
}
});
/**
* _getSafeElemSize returns getElementSize(), but refuses to return 0 for X or y,
* which was causing some calling operations in updateOnve and openTileSource to
* return NaN.
* @returns {point}
* @private
*/
function _getSafeElemSize (oElement) {
oElement = $.getElement( oElement );
return new $.Point(
(oElement.clientWidth === 0 ? 1 : oElement.clientWidth),
(oElement.clientHeight === 0 ? 1 : oElement.clientHeight)
);
}
/**
* @function
* @private
@ -1121,7 +1138,7 @@ function openTileSource( viewer, source ) {
}
_this.canvas.innerHTML = "";
THIS[ _this.hash ].prevContainerSize = $.getElementSize( _this.container );
THIS[ _this.hash ].prevContainerSize = _getSafeElemSize( _this.container );
if( _this.collectionMode ){
@ -1514,7 +1531,7 @@ function updateOnce( viewer ) {
//viewer.profiler.beginUpdate();
containerSize = $.getElementSize( viewer.container );
containerSize = _getSafeElemSize( viewer.container );
if ( !containerSize.equals( THIS[ viewer.hash ].prevContainerSize ) ) {
// maintain image position
viewer.viewport.resize( containerSize, true );