From b57d4dc65af929de1599631e25e2f5de847f7698 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 6 Jul 2022 13:14:56 +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 | 3 +++ roojs-ui-debug.js | 3 +++ roojs-ui.js | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 202049c51c..0fc0611ef7 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -2915,7 +2915,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this.scale;while(this.getScaleLevel()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); diff --git a/roojs-debug.js b/roojs-debug.js index 8d7bc83345..ece0782879 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -68811,6 +68811,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { var canvasEl = document.createElement("canvas"); var contextEl = canvasEl.getContext("2d"); + + console.log("SCALE LEVEL"); + console.log(this.getScaleLevel()); canvasEl.width = this.imageEl.OriginWidth * this.getScaleLevel(); canvasEl.height = this.imageEl.OriginWidth * this.getScaleLevel(); diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 8412ec9844..d2390b2bfd 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -44319,6 +44319,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { var canvasEl = document.createElement("canvas"); var contextEl = canvasEl.getContext("2d"); + + console.log("SCALE LEVEL"); + console.log(this.getScaleLevel()); canvasEl.width = this.imageEl.OriginWidth * this.getScaleLevel(); canvasEl.height = this.imageEl.OriginWidth * this.getScaleLevel(); diff --git a/roojs-ui.js b/roojs-ui.js index 8891bcb90b..577ef73ff2 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -1969,7 +1969,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this.scale;while(this.getScaleLevel()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); -- 2.39.2