From feda9db33fd9d8df272456d747dd6a9ae98f11f0 Mon Sep 17 00:00:00 2001
From: leon <leon@roojs.com>
Date: Wed, 6 Jul 2022 16:30:02 +0800
Subject: [PATCH] Roo/dialog/UploadCropbox.js roojs-core.js roojs-core-debug.js
 roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js

---
 Roo/dialog/UploadCropbox.js | 8 ++++----
 roojs-all.js                | 4 ++--
 roojs-debug.js              | 8 ++++----
 roojs-ui-debug.js           | 8 ++++----
 roojs-ui.js                 | 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Roo/dialog/UploadCropbox.js b/Roo/dialog/UploadCropbox.js
index d03b64f885..0339b829db 100644
--- a/Roo/dialog/UploadCropbox.js
+++ b/Roo/dialog/UploadCropbox.js
@@ -524,16 +524,16 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
         var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
-
-        if(minX < maxX || minY < maxY) {
-            return;
-        }
         
         console.log("maxX");
         console.log(maxX);
         console.log("maxY");
         console.log(maxY);
 
+        if(minX < maxX || minY < maxY) {
+            return;
+        }
+
         var x = Roo.isTouch ? e.browserEvent.touches[0].pageX : e.getPageX();
         var y = Roo.isTouch ? e.browserEvent.touches[0].pageY : e.getPageY();
         
diff --git a/roojs-all.js b/roojs-all.js
index d996cd2c83..986d63d20a 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2902,8 +2902,8 @@ this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocume
 if(!this.canvasEl){return;}var pw=Math.ceil((this.bodyEl.getWidth()-this.canvasEl.width)/2);var ph=Math.ceil((this.bodyEl.getHeight()-this.canvasEl.height)/2);this.previewEl.setLeft(pw);this.previewEl.setTop(ph);},onMouseDown:function(e){console.log("ON MOUSE DOWN");
 e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWidth()||this.canvasEl.height<this.thumbEl.getHeight())){this.dragable=false;return;}this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();
 this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseMove:function(e){console.log("ON MOUSE MOVE");e.stopEvent();if(!this.canvasLoaded){return;}if(!this.dragable){return;}var A=Math.ceil(this.thumbEl.getLeft(true));var B=Math.ceil(this.thumbEl.getTop(true));
-console.log("minX");console.log(A);console.log("minY");console.log(B);var C=Math.ceil(A+this.thumbEl.getWidth()-this.canvasEl.width);var D=Math.ceil(B+this.thumbEl.getHeight()-this.canvasEl.height);if(A<C||B<D){return;}console.log("maxX");console.log(C);console.log("maxY");
-console.log(D);var x=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();var y=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();x=x-this.mouseX;y=y-this.mouseY;var E=Math.ceil(x+this.previewEl.getLeft(true));var F=Math.ceil(y+this.previewEl.getTop(true));
+console.log("minX");console.log(A);console.log("minY");console.log(B);var C=Math.ceil(A+this.thumbEl.getWidth()-this.canvasEl.width);var D=Math.ceil(B+this.thumbEl.getHeight()-this.canvasEl.height);console.log("maxX");console.log(C);console.log("maxY");console.log(D);
+if(A<C||B<D){return;}var x=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();var y=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();x=x-this.mouseX;y=y-this.mouseY;var E=Math.ceil(x+this.previewEl.getLeft(true));var F=Math.ceil(y+this.previewEl.getTop(true));
 E=(A<E)?A:((C>E)?C:E);F=(B<F)?B:((D>F)?D:F);this.previewEl.setLeft(E);this.previewEl.setTop(F);this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseUp:function(e){e.stopEvent();
 this.dragable=false;},onMouseWheel:function(e){e.stopEvent();this.startScale=this.scale;this.scale=(e.getWheelDelta()==1)?(this.scale+1):(this.scale-1);if(!this.zoomable()){this.scale=this.startScale;return;}this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;
 if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}var B=Math.ceil(this.imageEl.OriginWidth*this.getScaleLevel()/A);var C=Math.ceil(this.imageEl.OriginHeight*this.getScaleLevel()/A);var D=this.imageEl.OriginWidth;var E=this.imageEl.OriginHeight;
diff --git a/roojs-debug.js b/roojs-debug.js
index 649a83a808..007adbf6d0 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68583,16 +68583,16 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
         var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
-
-        if(minX < maxX || minY < maxY) {
-            return;
-        }
         
         console.log("maxX");
         console.log(maxX);
         console.log("maxY");
         console.log(maxY);
 
+        if(minX < maxX || minY < maxY) {
+            return;
+        }
+
         var x = Roo.isTouch ? e.browserEvent.touches[0].pageX : e.getPageX();
         var y = Roo.isTouch ? e.browserEvent.touches[0].pageY : e.getPageY();
         
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index e1efc84df3..bdcd4a431d 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -44091,16 +44091,16 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
         var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
-
-        if(minX < maxX || minY < maxY) {
-            return;
-        }
         
         console.log("maxX");
         console.log(maxX);
         console.log("maxY");
         console.log(maxY);
 
+        if(minX < maxX || minY < maxY) {
+            return;
+        }
+
         var x = Roo.isTouch ? e.browserEvent.touches[0].pageX : e.getPageX();
         var y = Roo.isTouch ? e.browserEvent.touches[0].pageY : e.getPageY();
         
diff --git a/roojs-ui.js b/roojs-ui.js
index d4ddce724a..06e91852df 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1956,8 +1956,8 @@ this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocume
 if(!this.canvasEl){return;}var pw=Math.ceil((this.bodyEl.getWidth()-this.canvasEl.width)/2);var ph=Math.ceil((this.bodyEl.getHeight()-this.canvasEl.height)/2);this.previewEl.setLeft(pw);this.previewEl.setTop(ph);},onMouseDown:function(e){console.log("ON MOUSE DOWN");
 e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWidth()||this.canvasEl.height<this.thumbEl.getHeight())){this.dragable=false;return;}this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();
 this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseMove:function(e){console.log("ON MOUSE MOVE");e.stopEvent();if(!this.canvasLoaded){return;}if(!this.dragable){return;}var A=Math.ceil(this.thumbEl.getLeft(true));var B=Math.ceil(this.thumbEl.getTop(true));
-console.log("minX");console.log(A);console.log("minY");console.log(B);var C=Math.ceil(A+this.thumbEl.getWidth()-this.canvasEl.width);var D=Math.ceil(B+this.thumbEl.getHeight()-this.canvasEl.height);if(A<C||B<D){return;}console.log("maxX");console.log(C);console.log("maxY");
-console.log(D);var x=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();var y=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();x=x-this.mouseX;y=y-this.mouseY;var E=Math.ceil(x+this.previewEl.getLeft(true));var F=Math.ceil(y+this.previewEl.getTop(true));
+console.log("minX");console.log(A);console.log("minY");console.log(B);var C=Math.ceil(A+this.thumbEl.getWidth()-this.canvasEl.width);var D=Math.ceil(B+this.thumbEl.getHeight()-this.canvasEl.height);console.log("maxX");console.log(C);console.log("maxY");console.log(D);
+if(A<C||B<D){return;}var x=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();var y=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();x=x-this.mouseX;y=y-this.mouseY;var E=Math.ceil(x+this.previewEl.getLeft(true));var F=Math.ceil(y+this.previewEl.getTop(true));
 E=(A<E)?A:((C>E)?C:E);F=(B<F)?B:((D>F)?D:F);this.previewEl.setLeft(E);this.previewEl.setTop(F);this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseUp:function(e){e.stopEvent();
 this.dragable=false;},onMouseWheel:function(e){e.stopEvent();this.startScale=this.scale;this.scale=(e.getWheelDelta()==1)?(this.scale+1):(this.scale-1);if(!this.zoomable()){this.scale=this.startScale;return;}this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;
 if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}var B=Math.ceil(this.imageEl.OriginWidth*this.getScaleLevel()/A);var C=Math.ceil(this.imageEl.OriginHeight*this.getScaleLevel()/A);var D=this.imageEl.OriginWidth;var E=this.imageEl.OriginHeight;
-- 
2.39.2