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

Restore applyConstraints to avoid panning when clicking at max zoom.

Browse Source
This commit is contained in:
Antoine Vandecreme 2016-05-12 18:01:18 -04:00
parent 0c398eacdb
commit 07d66ce655
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/viewport.js
View File

@ -474,6 +474,13 @@ $.Viewport.prototype = {
}
},
// private
_applyZoomConstraints: function(zoom) {
return Math.max(
Math.min(zoom, this.getMaxZoom()),
this.getMinZoom());
},
/**
* @function
* @private
@ -563,7 +570,23 @@ $.Viewport.prototype = {
* @fires OpenSeadragon.Viewer.event:constrain
*/
applyConstraints: function(immediately) {
this.fitBoundsWithConstraints(this.getBounds(), immediately);
var actualZoom = this.getZoom();
var constrainedZoom = this._applyZoomConstraints(actualZoom);
if (actualZoom !== constrainedZoom) {
this.zoomTo(constrainedZoom, this.zoomPoint, immediately);
}
var bounds = this.getBoundsNoRotate();
var constrainedBounds = this._applyBoundaryConstraints(
bounds, immediately);
if (bounds.x !== constrainedBounds.x ||
bounds.y !== constrainedBounds.y ||
immediately) {
this.fitBounds(constrainedBounds.rotate(this.getRotation()),
immediately);
}
return this;
},
@ -615,10 +638,7 @@ $.Viewport.prototype = {
if (constraints) {
var newBoundsAspectRatio = newBounds.getAspectRatio();
var newConstrainedZoom = Math.max(
Math.min(newZoom, this.getMaxZoom()),
this.getMinZoom()
);
var newConstrainedZoom = this._applyZoomConstraints(newZoom);
if (newZoom !== newConstrainedZoom) {
newZoom = newConstrainedZoom;