Roo/dialog/UploadCropbox.js

[roojs1] / Roo / dialog / UploadCropbox.js

diff --git a/Roo/dialog/UploadCropbox.js b/Roo/dialog/UploadCropbox.js
index a90e28a..47db09a 100644 (file)
--- a/Roo/dialog/UploadCropbox.js
+++ b/Roo/dialog/UploadCropbox.js
@@ -589,8 +589,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
 
         console.log("IMAGE WIDTH: " + width);
         console.log("IMAGE HEIGHT: " + height);
-        console.log("WINDOW WIDTH: ");
-        console.log("WINDOW HEIGHT: ");
+        console.log("WINDOW WIDTH: " + this.thumbEl.getWidth() / this.getScaleLevel());
+        console.log("WINDOW HEIGHT: " + this.thumbEl.getHeight() / this.getScaleLevel());
  
         var maxWidth = this.imageEl.OriginWidth;
         var maxHeight = this.imageEl.OriginHeight;
@@ -623,8 +623,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                 !this.isDocument &&
                 (this.rotate == 0 || this.rotate == 180) && 
                 (
-                    (this.imageEl.OriginWidth / this.imageEl.OriginHeight > this.minWidth / this.minHeight) && 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
                 )