diff --git a/src/viewport.js b/src/viewport.js index da229885..0aff620d 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -529,26 +529,19 @@ $.Viewport.prototype = { var horizontalThreshold, leftDx, rightDx; if (newBounds.width > this._contentBoundsNoRotate.width) { horizontalThreshold = this.visibilityRatio * this._contentBoundsNoRotate.width; - leftDx = this._contentBoundsNoRotate.x - newBounds.x + horizontalThreshold; - rightDx = contentRight - boundsRight - horizontalThreshold; - - if (rightDx > 0) { - newBounds.x += rightDx; - } else if (leftDx < 0) { - newBounds.x += leftDx; - } } else { horizontalThreshold = this.visibilityRatio * newBounds.width; - leftDx = this._contentBoundsNoRotate.x - boundsRight + horizontalThreshold; - rightDx = contentRight - newBounds.x - horizontalThreshold; - if (horizontalThreshold > this._contentBoundsNoRotate.width) { - newBounds.x += (leftDx + rightDx) / 2; - } else if (rightDx < 0) { - newBounds.x += rightDx; - } else if (leftDx > 0) { - newBounds.x += leftDx; - } } + leftDx = this._contentBoundsNoRotate.x - boundsRight + horizontalThreshold; + rightDx = contentRight - newBounds.x - horizontalThreshold; + if (horizontalThreshold > this._contentBoundsNoRotate.width) { + newBounds.x += (leftDx + rightDx) / 2; + } else if (rightDx < 0) { + newBounds.x += rightDx; + } else if (leftDx > 0) { + newBounds.x += leftDx; + } + } if (this.wrapVertical) { @@ -560,26 +553,20 @@ $.Viewport.prototype = { var verticalThreshold, topDy, bottomDy; if (newBounds.height > this._contentBoundsNoRotate.height) { verticalThreshold = this.visibilityRatio * this._contentBoundsNoRotate.height; - topDy = this._contentBoundsNoRotate.y - newBounds.y + verticalThreshold; - bottomDy = contentBottom - boundsBottom - verticalThreshold; - - if (bottomDy > 0) { - newBounds.y += bottomDy; - } else if (topDy < 0) { - newBounds.y += topDy; - } - } else { + } else{ verticalThreshold = this.visibilityRatio * newBounds.height; - topDy = this._contentBoundsNoRotate.y - boundsBottom + verticalThreshold; - bottomDy = contentBottom - newBounds.y - verticalThreshold; - if (verticalThreshold > this._contentBoundsNoRotate.height) { - newBounds.y += (topDy + bottomDy) / 2; - } else if (bottomDy < 0) { - newBounds.y += bottomDy; - } else if (topDy > 0) { - newBounds.y += topDy; - } } + + topDy = this._contentBoundsNoRotate.y - boundsBottom + verticalThreshold; + bottomDy = contentBottom - newBounds.y - verticalThreshold; + if (verticalThreshold > this._contentBoundsNoRotate.height) { + newBounds.y += (topDy + bottomDy) / 2; + } else if (bottomDy < 0) { + newBounds.y += bottomDy; + } else if (topDy > 0) { + newBounds.y += topDy; + } + } return newBounds;