From: leon <leon@roojs.com>
Date: Thu, 7 Jul 2022 02:57:29 +0000 (+0800)
Subject: roojs-core.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=595ee175457680f2ef410797bba0f90d27a7a4a1

roojs-core.js
roojs-core-debug.js
roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js
---

diff --git a/roojs-all.js b/roojs-all.js
index 026c2e6c8a..b87596ab8f 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2905,7 +2905,7 @@ this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWid
 if(A>C){var E=A;A=C;C=E;}if(B>D){var F=B;B=D;D=F;}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 G=Math.ceil(x+this.previewEl.getLeft(true));
 var H=Math.ceil(y+this.previewEl.getTop(true));G=(G<A)?A:((G>C)?C:G);H=(H<B)?B:((H>D)?D:H);this.previewEl.setLeft(G);this.previewEl.setTop(H);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);console.log("START SCALE:"+this.startScale);console.log("TEST SCALE: "+this.scale);
-if(!this.zoomable()){this.scale=this.startScale;return;}console.log("END SCALE: "+this.Scale);this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}
+if(!this.zoomable()){this.scale=this.startScale;return;}console.log("END SCALE: "+this.scale);this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}
 console.log("MINSCALE: "+A);var B=Math.ceil(this.imageEl.OriginWidth*this.getScaleLevel()/A);var C=Math.ceil(this.imageEl.OriginHeight*this.getScaleLevel()/A);console.log("WIDTH: "+B);console.log("HEIGHT: "+C);var D=this.imageEl.OriginWidth;var E=this.imageEl.OriginHeight;
 if(this.isDocument&&(this.rotate==0||this.rotate==180)&&(B>this.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(B<this.minWidth&&C<this.minHeight))){return false;}if(this.isDocument&&(this.rotate==90||this.rotate==270)&&(B>this.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(B<this.minHeight&&C<this.minWidth))){return false;
 }if(!this.isDocument&&(this.rotate==0||this.rotate==180)&&(B<this.minWidth||C<this.minHeight||B>D||C>E)){return false;}if(!this.isDocument&&(this.rotate==90||this.rotate==270)&&(B<this.minHeight||B>this.imageEl.OriginWidth||C<this.minWidth||C>this.imageEl.OriginHeight)){return false;
diff --git a/roojs-debug.js b/roojs-debug.js
index 71442e5359..b3b63ecd37 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68629,7 +68629,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
             return;
         }
 
-        console.log("END SCALE: " + this.Scale);
+        console.log("END SCALE: " + this.scale);
         
         this.draw();
         
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 7fcbd2aa1c..8ed72891c5 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -44137,7 +44137,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
             return;
         }
 
-        console.log("END SCALE: " + this.Scale);
+        console.log("END SCALE: " + this.scale);
         
         this.draw();
         
diff --git a/roojs-ui.js b/roojs-ui.js
index 51605e19e6..1f6ea77417 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1959,7 +1959,7 @@ this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWid
 if(A>C){var E=A;A=C;C=E;}if(B>D){var F=B;B=D;D=F;}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 G=Math.ceil(x+this.previewEl.getLeft(true));
 var H=Math.ceil(y+this.previewEl.getTop(true));G=(G<A)?A:((G>C)?C:G);H=(H<B)?B:((H>D)?D:H);this.previewEl.setLeft(G);this.previewEl.setTop(H);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);console.log("START SCALE:"+this.startScale);console.log("TEST SCALE: "+this.scale);
-if(!this.zoomable()){this.scale=this.startScale;return;}console.log("END SCALE: "+this.Scale);this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}
+if(!this.zoomable()){this.scale=this.startScale;return;}console.log("END SCALE: "+this.scale);this.draw();return;},zoomable:function(){var A=this.thumbEl.getWidth()/this.minWidth;if(this.minWidth<this.minHeight){A=this.thumbEl.getHeight()/this.minHeight;}
 console.log("MINSCALE: "+A);var B=Math.ceil(this.imageEl.OriginWidth*this.getScaleLevel()/A);var C=Math.ceil(this.imageEl.OriginHeight*this.getScaleLevel()/A);console.log("WIDTH: "+B);console.log("HEIGHT: "+C);var D=this.imageEl.OriginWidth;var E=this.imageEl.OriginHeight;
 if(this.isDocument&&(this.rotate==0||this.rotate==180)&&(B>this.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(B<this.minWidth&&C<this.minHeight))){return false;}if(this.isDocument&&(this.rotate==90||this.rotate==270)&&(B>this.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(B<this.minHeight&&C<this.minWidth))){return false;
 }if(!this.isDocument&&(this.rotate==0||this.rotate==180)&&(B<this.minWidth||C<this.minHeight||B>D||C>E)){return false;}if(!this.isDocument&&(this.rotate==90||this.rotate==270)&&(B<this.minHeight||B>this.imageEl.OriginWidth||C<this.minWidth||C>this.imageEl.OriginHeight)){return false;