From 2e2eed4d0f1ccd85ac20582b3f38643f31cf4e05 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 6 Jul 2022 11:22:54 +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 | 2 +- roojs-debug.js | 2 +- roojs-ui-debug.js | 2 +- roojs-ui.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index a01e39a35c..67a06155ab 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2916,7 +2916,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this }this.rotate=(this.rotate>180)?0:this.rotate+90;this.draw();return;}this.scale=this.startScale;this.onRotateFail();return false;}this.rotate=(this.rotate>180)?0:this.rotate+90;if(this.isDocument){this.setThumbBoxSize();this.setThumbBoxPosition();this.setCanvasPosition(); }this.draw();this.fireEvent('rotate',this,'right');},onRotateFail:function(){this.errorEl.show(true);var A=this;(function(){A.errorEl.hide(true);}).defer(this.errorTimeout);},draw:function(){console.log("DRAW");this.previewEl.dom.innerHTML='';var A=document.createElement("canvas"); var B=A.getContext("2d");A.width=this.imageEl.OriginWidth*this.getScaleLevel();A.height=this.imageEl.OriginWidth*this.getScaleLevel();var C=this.imageEl.OriginWidth/2;if(this.imageEl.OriginWidththis.imageEl.OriginHeight){this.contextEl.drawImage(A,Math.abs(this.canvasEl.width-this.canvasEl.height),0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height); break;}this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);break;case 180:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel(); diff --git a/roojs-debug.js b/roojs-debug.js index 9d3f421294..0bb1a8119e 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -68826,7 +68826,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { contextEl.translate(center, center); contextEl.rotate(this.rotate * Math.PI / 180); - contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, center * -1, center * -1, this.imageEl.OriginWidth, this.imageEl.OriginHeight); + contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight); this.canvasEl = document.createElement("canvas"); diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 73aea0da02..071db9eb2e 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -44334,7 +44334,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { contextEl.translate(center, center); contextEl.rotate(this.rotate * Math.PI / 180); - contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, center * -1, center * -1, this.imageEl.OriginWidth, this.imageEl.OriginHeight); + contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight); this.canvasEl = document.createElement("canvas"); diff --git a/roojs-ui.js b/roojs-ui.js index d5b73c0752..12ce2b166e 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1970,7 +1970,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this }this.rotate=(this.rotate>180)?0:this.rotate+90;this.draw();return;}this.scale=this.startScale;this.onRotateFail();return false;}this.rotate=(this.rotate>180)?0:this.rotate+90;if(this.isDocument){this.setThumbBoxSize();this.setThumbBoxPosition();this.setCanvasPosition(); }this.draw();this.fireEvent('rotate',this,'right');},onRotateFail:function(){this.errorEl.show(true);var A=this;(function(){A.errorEl.hide(true);}).defer(this.errorTimeout);},draw:function(){console.log("DRAW");this.previewEl.dom.innerHTML='';var A=document.createElement("canvas"); var B=A.getContext("2d");A.width=this.imageEl.OriginWidth*this.getScaleLevel();A.height=this.imageEl.OriginWidth*this.getScaleLevel();var C=this.imageEl.OriginWidth/2;if(this.imageEl.OriginWidththis.imageEl.OriginHeight){this.contextEl.drawImage(A,Math.abs(this.canvasEl.width-this.canvasEl.height),0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height); break;}this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);break;case 180:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel(); -- 2.39.2