roojs-core.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index 4bf9f43..551e6d1 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68274,8 +68274,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onRender : function(ct, position)
     {
-        console.log("On Render");
-        console.log(this);
         Roo.dialog.UploadCropbox.superclass.onRender.call(this, ct, position);
 
         if(this.el){
@@ -68448,6 +68446,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onFileSelected : function(e)
     {
+        console.log("ON FILE SELECTED");
         e.preventDefault();
         
         if(typeof(this.selectorEl.dom.files) == 'undefined' || !this.selectorEl.dom.files.length){
@@ -68474,6 +68473,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     loadCanvas : function(src)
     {   
+        console.log("LOAD CANVAS");
+        console.log(src);
         if(this.fireEvent('beforeloadcanvas', this, src) != false){
             
             this.reset();
@@ -68490,6 +68491,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onLoadCanvas : function()
     {   
+        console.log("ON LOAD CANVAS");
         this.imageEl.OriginWidth = this.imageEl.naturalWidth || this.imageEl.width;
         this.imageEl.OriginHeight = this.imageEl.naturalHeight || this.imageEl.height;
 
@@ -68605,9 +68607,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         e.stopEvent();
         
         this.startScale = this.scale;
-        console.log("START SCALE: " + this.scale);
         this.scale = (e.getWheelDelta() == 1) ? (this.scale + 1) : (this.scale - 1);
-        console.log("END SCALE: " + this.scale);
         if(!this.zoomable()){
             this.scale = this.startScale;
             return;
@@ -68620,36 +68620,17 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     zoomable : function()
     {
-        console.log("THUMBEL");
-        console.log(this.thumbEl);
         var minScale = this.thumbEl.getWidth() / this.minWidth;
         
         if(this.minWidth < this.minHeight){
             minScale = this.thumbEl.getHeight() / this.minHeight;
         }
-
-        console.log("MINSCALE: " + minScale);
         
         var width = Math.ceil(this.imageEl.OriginWidth * this.getScaleLevel() / minScale);
         var height = Math.ceil(this.imageEl.OriginHeight * this.getScaleLevel() / minScale);
 
         var maxWidth = this.imageEl.OriginWidth;
         var maxHeight = this.imageEl.OriginHeight;
-
-        if(this.imageEl.OriginWidth / this.imageEl.OriginHeight  > this.minWidth / this.minHeight && this.imageEl.OriginHeight < this.minHeight) {
-            maxHeight = this.minHeight;
-            maxWidth = this.imageEl.OriginWidth / this.imageEl.OriginHeight * this.minHeight;
-        }
-        if(this.imageEl.OriginWidth / this.imageEl.OriginHeight  < this.minWidth / this.minHeight && this.imageEl.OriginWidth < this.minWidth) {
-            maxWidth = this.minWidth;
-            maxHeight = this.imageEl.OriginHeight /this.imageEl.OriginWidth * this.minWidth;
-        }
-
-        console.log("GETSCALELEVEL: " + this.getScaleLevel());
-        console.log("width: " + width);
-        console.log("height: " + height);
-        console.log("maxWidth: " + maxHeight);
-        console.log("maxHeight: " + maxWidth);
         
         if(
                 this.isDocument &&
@@ -68679,9 +68660,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                 !this.isDocument &&
                 (this.rotate == 0 || this.rotate == 180) && 
                 (
-                    (this.imageEl.OriginWidth / this.imageEl.OriginHeight  > this.minWidth / this.minHeight && width < this.minWidth) || 
-                    width > maxWidth || 
-                    (this.imageEl.OriginWidth / this.imageEl.OriginHeight  < this.minWidth / this.minHeight && height < this.minHeight) || 
+                    width < this.minWidth ||
+                    height < this.minHeight ||
+                    width > maxWidth ||
                     height > maxHeight
                 )
         ){
@@ -69255,7 +69236,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     getScaleLevel : function()
     {
-        console.log("BASESCALE: " + this.baseScale);
         return this.baseScale * Math.pow(1.02, this.scale);
     },
     
@@ -69447,6 +69427,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     prepare : function(file)
     {   
+        console.log("PREPARE");
+        console.log(file);
         if(this.loadMask){
             this.maskEl.mask(this.loadingText);
         }