From 6c4dc975169e822188749ce5c28d63479008be56 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 6 Jul 2022 16:40:45 +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, 14 insertions(+), 14 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index c98515b63d..edab65d3ca 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2904,10 +2904,10 @@ e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.c 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);console.log("maxX");console.log(C);console.log("maxY");console.log(D); 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||(Bthis.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; }return true;},onRotateLeft:function(e){if(!this.isDocument&&(this.canvasEl.height bgX) ? maxX : bgX); - bgY = (minY < bgY) ? minY : ((maxY > bgY) ? maxY : bgY); + // bgX = (minX < bgX) ? minX : ((maxX > bgX) ? maxX : bgX); + // bgY = (minY < bgY) ? minY : ((maxY > bgY) ? maxY : bgY); this.previewEl.setLeft(bgX); this.previewEl.setTop(bgY); diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 7313d9529e..b02294ea8b 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -44112,12 +44112,12 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { console.log(x); console.log(y); - + var bgX = Math.ceil(x + this.previewEl.getLeft(true)); var bgY = Math.ceil(y + this.previewEl.getTop(true)); - bgX = (minX < bgX) ? minX : ((maxX > bgX) ? maxX : bgX); - bgY = (minY < bgY) ? minY : ((maxY > bgY) ? maxY : bgY); + // bgX = (minX < bgX) ? minX : ((maxX > bgX) ? maxX : bgX); + // bgY = (minY < bgY) ? minY : ((maxY > bgY) ? maxY : bgY); this.previewEl.setLeft(bgX); this.previewEl.setTop(bgY); diff --git a/roojs-ui.js b/roojs-ui.js index 94db2ca212..2086ca127d 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1958,10 +1958,10 @@ e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.c 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);console.log("maxX");console.log(C);console.log("maxY");console.log(D); 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||(Bthis.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; }return true;},onRotateLeft:function(e){if(!this.isDocument&&(this.canvasEl.height