From 91d84b01b90ae4789b771bb1ee617a9c6b44a6ad Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 6 Jul 2022 16:29:27 +0800 Subject: [PATCH] roojs-core.js roojs-core-debug.js roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 8 ++++---- roojs-debug.js | 6 +++++- roojs-ui-debug.js | 6 +++++- roojs-ui.js | 8 ++++---- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 0553ac03f8..d996cd2c83 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2902,10 +2902,10 @@ 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.widthE)?C:E); -F=(BF)?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; +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(AE)?C:E);F=(BF)?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.minWidththis.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(Bthis.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(BD||C>E)){return false;}if(!this.isDocument&&(this.rotate==90||this.rotate==270)&&(Bthis.imageEl.OriginWidth||Cthis.imageEl.OriginHeight)){return false; diff --git a/roojs-debug.js b/roojs-debug.js index 8f6eb7315f..649a83a808 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -68583,12 +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); - + 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 f35d373d2c..e1efc84df3 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -44091,12 +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); - + 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 8e9bb39c87..d4ddce724a 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1956,10 +1956,10 @@ 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.widthE)?C:E); -F=(BF)?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; +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(AE)?C:E);F=(BF)?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.minWidththis.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(Bthis.imageEl.OriginWidth||C>this.imageEl.OriginHeight||(BD||C>E)){return false;}if(!this.isDocument&&(this.rotate==90||this.rotate==270)&&(Bthis.imageEl.OriginWidth||Cthis.imageEl.OriginHeight)){return false; -- 2.39.2