mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 22:56:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #384 from msalsbery/Firefox-Unit-Tests

Browse Source 
Float to Integer Fix for 'px' String Values in Navigator
This commit is contained in:
iangilman 2014-04-28 09:55:07 -07:00
commit c9e44f9f6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/navigator.js
View File

@ -189,8 +189,8 @@ $.Navigator = function( options ){
this.element.style.width = typeof ( options.width ) == "number" ? ( options.width + 'px' ) : options.width; this.element.style.width = typeof ( options.width ) == "number" ? ( options.width + 'px' ) : options.width;
} else { } else {
viewerSize = $.getElementSize( viewer.element ); viewerSize = $.getElementSize( viewer.element );
this.element.style.height = ( viewerSize.y * options.sizeRatio ) + 'px'; this.element.style.height = Math.round( viewerSize.y * options.sizeRatio ) + 'px';
this.element.style.width = ( viewerSize.x * options.sizeRatio ) + 'px'; this.element.style.width = Math.round( viewerSize.x * options.sizeRatio ) + 'px';
this.oldViewerSize = viewerSize; this.oldViewerSize = viewerSize;
} }
navigatorSize = $.getElementSize( this.element ); navigatorSize = $.getElementSize( this.element );
@ -268,8 +268,8 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
newWidth = Math.sqrt(this.elementArea * (viewerSize.x / viewerSize.y)); newWidth = Math.sqrt(this.elementArea * (viewerSize.x / viewerSize.y));
newHeight = this.elementArea / newWidth; newHeight = this.elementArea / newWidth;
} }
this.element.style.width = newWidth + 'px'; this.element.style.width = Math.round( newWidth ) + 'px';
this.element.style.height = newHeight + 'px'; this.element.style.height = Math.round( newHeight ) + 'px';
this.updateSize(); this.updateSize();
} }
@ -281,14 +281,14 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
//update style for navigator-box //update style for navigator-box
(function(style) { (function(style) {
style.top = topleft.y + 'px'; style.top = Math.round( topleft.y ) + 'px';
style.left = 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.max( width, 0 ) + 'px'; style.width = Math.round( Math.max( width, 0 ) ) + 'px';
style.height = Math.max( height, 0 ) + 'px'; style.height = Math.round( Math.max( height, 0 ) ) + 'px';
}( this.displayRegion.style )); }( this.displayRegion.style ));
} }