Roo/bootstrap/UploadCropbox.js
authoredward <edward@roojs.com>
Fri, 22 Jan 2016 09:07:32 +0000 (17:07 +0800)
committeredward <edward@roojs.com>
Fri, 22 Jan 2016 09:07:32 +0000 (17:07 +0800)
Roo/bootstrap/UploadCropbox.js

index 9254254..383e8f6 100644 (file)
@@ -370,9 +370,6 @@ Roo.extend(Roo.bootstrap.UploadCropbox, Roo.bootstrap.Component,  {
     {
         e.stopEvent();
         
-        Roo.log([this.image.getWidth(), this.image.getHeight()]);
-        Roo.log([this.thumb.getWidth(), this.thumb.getHeight()]);
-        
         if(
                 (
                     this.rotate == 0 || 
@@ -416,6 +413,34 @@ Roo.extend(Roo.bootstrap.UploadCropbox, Roo.bootstrap.Component,  {
     {
         e.stopEvent();
         
+        if(
+                (
+                    this.rotate == 0 || 
+                    this.rotate == 180
+                ) 
+                &&
+                (
+                    this.image.getHeight() < this.thumb.getWidth() ||
+                    this.image.getWidth() < this.thumb.getHeight()
+                )
+        ){
+            return;
+        }
+        
+        if(
+                (
+                    this.rotate == 90 || 
+                    this.rotate == 270
+                ) 
+                &&
+                (
+                    this.image.getWidth() < this.thumb.getWidth() ||
+                    this.image.getHeight() < this.thumb.getHeight()
+                )
+        ){
+            return;
+        }
+        
         this.rotate = (this.rotate > 180) ? 0 : this.rotate + 90;
         
         this.imageCanvas.setStyle({