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

Changed preserveImageSizeOnResize to require autoResize=true.

Browse Source 
Refactored resizing code to share more code.
Removed preserveImageSizeOnResize parameter from viewer.
This commit is contained in:
Grant Echols 2015-06-24 10:48:00 -06:00
parent fb21dabd76
commit df878f6f82
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openseadragon.js
View File

@ -253,7 +253,7 @@
* Set to false to prevent polling for viewer size changes. Useful for providing custom resize behavior. * Set to false to prevent polling for viewer size changes. Useful for providing custom resize behavior.
* *
* @property {Boolean} [preserveImageSizeOnResize=false] * @property {Boolean} [preserveImageSizeOnResize=false]
* Set to true to have the image size preserved when the viewer is resized. This requires autoResize=false. * Set to true to have the image size preserved when the viewer is resized. This requires autoResize=true (default).
* *
* @property {Number} [pixelsPerWheelLine=40] * @property {Number} [pixelsPerWheelLine=40]
* For pixel-resolution scrolling devices, the number of pixels equal to one scroll line. * For pixel-resolution scrolling devices, the number of pixels equal to one scroll line.

22
src/viewer.js
View File

@ -408,7 +408,6 @@ $.Viewer = function( options ) {
width: this.navigatorWidth, width: this.navigatorWidth,
height: this.navigatorHeight, height: this.navigatorHeight,
autoResize: this.navigatorAutoResize, autoResize: this.navigatorAutoResize,
preserveImageSizeOnResize: this.preserveImageSizeOnResize,
prefixUrl: this.prefixUrl, prefixUrl: this.prefixUrl,
viewer: this, viewer: this,
navigatorRotate: this.navigatorRotate, navigatorRotate: this.navigatorRotate,
@ -2829,17 +2828,7 @@ function updateOnce( viewer ) {
if ( viewer.autoResize ) { if ( viewer.autoResize ) {
containerSize = _getSafeElemSize( viewer.container ); containerSize = _getSafeElemSize( viewer.container );
if ( !containerSize.equals( THIS[ viewer.hash ].prevContainerSize ) ) { if ( !containerSize.equals( THIS[ viewer.hash ].prevContainerSize ) ) {
// maintain image position if ( viewer.preserveImageSizeOnResize ) {
var oldBounds = viewer.viewport.getBounds();
var oldCenter = viewer.viewport.getCenter();
resizeViewportAndRecenter(viewer, containerSize, oldBounds, oldCenter);
THIS[ viewer.hash ].prevContainerSize = containerSize;
THIS[ viewer.hash ].forceRedraw = true;
}
}
else if ( viewer.preserveImageSizeOnResize ) {
containerSize = _getSafeElemSize( viewer.container );
if ( !containerSize.equals( THIS[ viewer.hash ].prevContainerSize ) ) {
var prevContainerSize = THIS[ viewer.hash ].prevContainerSize; var prevContainerSize = THIS[ viewer.hash ].prevContainerSize;
var bounds = viewer.viewport.getBounds(true); var bounds = viewer.viewport.getBounds(true);
var deltaX = (containerSize.x - prevContainerSize.x); var deltaX = (containerSize.x - prevContainerSize.x);
@ -2853,8 +2842,13 @@ function updateOnce( viewer ) {
bounds.x -= (viewportDiff.x / 2); bounds.x -= (viewportDiff.x / 2);
bounds.y -= (viewportDiff.y / 2); bounds.y -= (viewportDiff.y / 2);
viewer.viewport.fitBoundsWithConstraints(bounds, true); viewer.viewport.fitBoundsWithConstraints(bounds, true);
viewer.forceRedraw(); }
else {
// maintain image position
var oldBounds = viewer.viewport.getBounds();
var oldCenter = viewer.viewport.getCenter();
resizeViewportAndRecenter(viewer, containerSize, oldBounds, oldCenter);
}
THIS[ viewer.hash ].prevContainerSize = containerSize; THIS[ viewer.hash ].prevContainerSize = containerSize;
THIS[ viewer.hash ].forceRedraw = true; THIS[ viewer.hash ].forceRedraw = true;
} }