From: leon <leon@roojs.com>
Date: Tue, 5 Jul 2022 06:51:25 +0000 (+0800)
Subject: roojs-core.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=c396103a8279eb3a6d8b60572520ab15fe566f2b

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 3589bd5991..5a1bf101c1 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2898,7 +2898,7 @@ break;case 'download':this.download(e);break;default:break;}this.fireEvent('foot
 if(typeof(this.selectorEl.dom.files)=='undefined'||!this.selectorEl.dom.files.length){return;}var A=this.selectorEl.dom.files[0];if(this.fireEvent('inspect',this,A)!=false){this.prepare(A);}},trash:function(e){this.fireEvent('trash',this);},download:function(e){this.fireEvent('download',this);
 },loadCanvas:function(A){if(this.fireEvent('beforeloadcanvas',this,A)!=false){this.reset();this.imageEl=document.createElement('img');var B=this;this.imageEl.addEventListener("load",function(){B.onLoadCanvas();});this.imageEl.src=A;}},onLoadCanvas:function(){this.imageEl.OriginWidth=this.imageEl.naturalWidth||this.imageEl.width;
 this.imageEl.OriginHeight=this.imageEl.naturalHeight||this.imageEl.height;var A=this;if(this.imageEl.OriginWidth<this.minWidth){Roo.Msg.show({title:'Error',msg:"Image width should be at least 720",buttons:{ok:true},fn:function(B){A.selectorEl.dom.click();
-}});return;}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);this.notifyEl.hide();this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocument){this.setThumbBoxSize();}this.setThumbBoxPosition();
+}});}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);this.notifyEl.hide();this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocument){this.setThumbBoxSize();}this.setThumbBoxPosition();
 this.baseScaleLevel();this.draw();this.resize();this.canvasLoaded=true;}if(this.loadMask){this.maskEl.unmask();}},setCanvasPosition:function(){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){e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWidth()||this.canvasEl.height<this.thumbEl.getHeight())){this.dragable=false;
 return;}this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseMove:function(e){e.stopEvent();if(!this.canvasLoaded){return;}if(!this.dragable){return;}var A=Math.ceil(this.thumbEl.getLeft(true));
diff --git a/roojs-debug.js b/roojs-debug.js
index 085f5bd9a8..66a6493c44 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68505,7 +68505,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                     _this.selectorEl.dom.click();
                 }
             });
-            return;
         }
 
         if(this.fireEvent('loadcanvas', this, this.imageEl) != false){
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index dde6e90ae7..4b5122b5c9 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -44013,7 +44013,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                     _this.selectorEl.dom.click();
                 }
             });
-            return;
         }
 
         if(this.fireEvent('loadcanvas', this, this.imageEl) != false){
diff --git a/roojs-ui.js b/roojs-ui.js
index 89c102d91a..834a3b65e6 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1952,7 +1952,7 @@ break;case 'download':this.download(e);break;default:break;}this.fireEvent('foot
 if(typeof(this.selectorEl.dom.files)=='undefined'||!this.selectorEl.dom.files.length){return;}var A=this.selectorEl.dom.files[0];if(this.fireEvent('inspect',this,A)!=false){this.prepare(A);}},trash:function(e){this.fireEvent('trash',this);},download:function(e){this.fireEvent('download',this);
 },loadCanvas:function(A){if(this.fireEvent('beforeloadcanvas',this,A)!=false){this.reset();this.imageEl=document.createElement('img');var B=this;this.imageEl.addEventListener("load",function(){B.onLoadCanvas();});this.imageEl.src=A;}},onLoadCanvas:function(){this.imageEl.OriginWidth=this.imageEl.naturalWidth||this.imageEl.width;
 this.imageEl.OriginHeight=this.imageEl.naturalHeight||this.imageEl.height;var A=this;if(this.imageEl.OriginWidth<this.minWidth){Roo.Msg.show({title:'Error',msg:"Image width should be at least 720",buttons:{ok:true},fn:function(B){A.selectorEl.dom.click();
-}});return;}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);this.notifyEl.hide();this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocument){this.setThumbBoxSize();}this.setThumbBoxPosition();
+}});}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);this.notifyEl.hide();this.thumbEl.show();this.footerEl.show();this.baseRotateLevel();if(this.isDocument){this.setThumbBoxSize();}this.setThumbBoxPosition();
 this.baseScaleLevel();this.draw();this.resize();this.canvasLoaded=true;}if(this.loadMask){this.maskEl.unmask();}},setCanvasPosition:function(){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){e.stopEvent();this.dragable=true;this.pinching=false;if(this.isDocument&&(this.canvasEl.width<this.thumbEl.getWidth()||this.canvasEl.height<this.thumbEl.getHeight())){this.dragable=false;
 return;}this.mouseX=Roo.isTouch?e.browserEvent.touches[0].pageX:e.getPageX();this.mouseY=Roo.isTouch?e.browserEvent.touches[0].pageY:e.getPageY();},onMouseMove:function(e){e.stopEvent();if(!this.canvasLoaded){return;}if(!this.dragable){return;}var A=Math.ceil(this.thumbEl.getLeft(true));