var width = Math.ceil(this.imageEl.OriginWidth * this.getScaleLevel() / minScale);
var height = Math.ceil(this.imageEl.OriginHeight * this.getScaleLevel() / minScale);
- console.log("WIDTH: " + width);
- console.log("HEIGHT: " + height);
+ console.log("IMAGE WIDTH: " + width);
+ console.log("IMAGE HEIGHT: " + height);
+ console.log("WINDOW WIDTH: " + this.thumbEl.getWidth() / this.baseScale * this.getScaleLevel() / minScale );
+ console.log("WINDOW HEIGHT: " + this.thumbEl.getHeight() / this.baseScale * this.getScaleLevel() / minScale);
var maxWidth = this.imageEl.OriginWidth;
var maxHeight = this.imageEl.OriginHeight;
!this.isDocument &&
(this.rotate == 0 || this.rotate == 180) &&
(
- (this.imageEl.OriginWidth >= this.minWidth) && width < this.minWidth ||
- (this.imageEl.OriginHeight >= this.minHeight) && height < this.minHeight ||
+ (this.imageEl.OriginWidth / this.imageEl.OriginHeight >= this.minWidth / this.minHeight) && width < this.minWidth ||
+ (this.imageEl.OriginWidth / this.imageEl.OriginHeight <= this.minWidth / this.minHeight) && height < this.minHeight ||
width > maxWidth ||
height > maxHeight
)