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 20fb250..fe99d4d 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2897,8 +2897,8 @@ this.setCanvasPosition();}},onFooterButtonClick:function(e,el,o,A){switch(A){cas
 break;case 'download':this.download(e);break;default:break;}this.fireEvent('footerbuttonclick',this,A);},beforeSelectFile:function(e){e.preventDefault();if(this.fireEvent('beforeselectfile',this)!=false){this.selectorEl.dom.click();}},onFileSelected:function(e){e.preventDefault();
 if(typeof(this.selectorEl.dom.files)=='undefined'||!this.selectorEl.dom.files.length){console.log("EMPTY RETURN");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){console.log("BEFORESHOW");
-Roo.Msg.show({title:'Error',msg:"Image width should be at least 720",buttons:{ok:true},fn:function(B){A.selectorEl.dom.value='';console.log(A.selectorEl.dom.value);A.selectorEl.dom.click();}});}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);
+});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;var B="";if(this.imageEl.OriginWidth<this.minWidth){B="Image width should be at least "+this.minWidth+"\n";
+}if(this.imageEl.OriginHeight<this.minHeight){B="Image height should be at least "+this.minHeight+"\n";}if(B.length!=''){Roo.Msg.show({title:'Error',msg:B,buttons:{ok:true},fn:function(C){A.selectorEl.dom.value='';A.selectorEl.dom.click();}});}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();

diff --git a/roojs-debug.js b/roojs-debug.js
index 5590e8d..9f05d6a 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68496,15 +68496,23 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
 
         var _this = this;
 
+        var errorMsg = "";
+
         if(this.imageEl.OriginWidth < this.minWidth) {
-            console.log("BEFORESHOW");
+            errorMsg = "Image width should be at least " + this.minWidth + "\n";
+        }
+
+        if(this.imageEl.OriginHeight < this.minHeight) {
+            errorMsg = "Image height should be at least " + this.minHeight + "\n";
+        }
+
+        if(errorMsg.length != '') {
             Roo.Msg.show({
                 title: 'Error',
-                msg: "Image width should be at least 720",
+                msg: errorMsg,
                 buttons: {ok : true},
                 fn: function(res) {
                     _this.selectorEl.dom.value = '';
-                    console.log(_this.selectorEl.dom.value);
                     _this.selectorEl.dom.click();
                 }
             });

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 2c944a8..bcd80ea 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -44004,15 +44004,23 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
 
         var _this = this;
 
+        var errorMsg = "";
+
         if(this.imageEl.OriginWidth < this.minWidth) {
-            console.log("BEFORESHOW");
+            errorMsg = "Image width should be at least " + this.minWidth + "\n";
+        }
+
+        if(this.imageEl.OriginHeight < this.minHeight) {
+            errorMsg = "Image height should be at least " + this.minHeight + "\n";
+        }
+
+        if(errorMsg.length != '') {
             Roo.Msg.show({
                 title: 'Error',
-                msg: "Image width should be at least 720",
+                msg: errorMsg,
                 buttons: {ok : true},
                 fn: function(res) {
                     _this.selectorEl.dom.value = '';
-                    console.log(_this.selectorEl.dom.value);
                     _this.selectorEl.dom.click();
                 }
             });

diff --git a/roojs-ui.js b/roojs-ui.js
index 37f5a64..9b3fa99 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1951,8 +1951,8 @@ this.setCanvasPosition();}},onFooterButtonClick:function(e,el,o,A){switch(A){cas
 break;case 'download':this.download(e);break;default:break;}this.fireEvent('footerbuttonclick',this,A);},beforeSelectFile:function(e){e.preventDefault();if(this.fireEvent('beforeselectfile',this)!=false){this.selectorEl.dom.click();}},onFileSelected:function(e){e.preventDefault();
 if(typeof(this.selectorEl.dom.files)=='undefined'||!this.selectorEl.dom.files.length){console.log("EMPTY RETURN");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){console.log("BEFORESHOW");
-Roo.Msg.show({title:'Error',msg:"Image width should be at least 720",buttons:{ok:true},fn:function(B){A.selectorEl.dom.value='';console.log(A.selectorEl.dom.value);A.selectorEl.dom.click();}});}if(this.fireEvent('loadcanvas',this,this.imageEl)!=false){this.bodyEl.un('click',this.beforeSelectFile,this);
+});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;var B="";if(this.imageEl.OriginWidth<this.minWidth){B="Image width should be at least "+this.minWidth+"\n";
+}if(this.imageEl.OriginHeight<this.minHeight){B="Image height should be at least "+this.minHeight+"\n";}if(B.length!=''){Roo.Msg.show({title:'Error',msg:B,buttons:{ok:true},fn:function(C){A.selectorEl.dom.value='';A.selectorEl.dom.click();}});}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();