roojs-core.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index 007adbf..2deff15 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68544,7 +68544,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onMouseDown : function(e)
     {   
-        console.log("ON MOUSE DOWN");
         e.stopEvent();
         
         this.dragable = true;
@@ -68562,7 +68561,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onMouseMove : function(e)
     {   
-        console.log ("ON MOUSE MOVE");
         e.stopEvent();
         
         if(!this.canvasLoaded){
@@ -68575,22 +68573,20 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var minX = Math.ceil(this.thumbEl.getLeft(true));
         var minY = Math.ceil(this.thumbEl.getTop(true));
-
-        console.log("minX");
-        console.log(minX);
-        console.log("minY");
-        console.log(minY);
         
         var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
         var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
-        
-        console.log("maxX");
-        console.log(maxX);
-        console.log("maxY");
-        console.log(maxY);
 
-        if(minX < maxX || minY < maxY) {
-            return;
+        if(minX > maxX) {
+            var tempX = minX;
+            minX = maxX;
+            maxX = tempX;
+        }
+
+        if(minY > maxY) {
+            var tempY = minY;
+            minY = maxY;
+            maxY = tempY;
         }
 
         var x = Roo.isTouch ? e.browserEvent.touches[0].pageX : e.getPageX();
@@ -68598,12 +68594,12 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         x = x - this.mouseX;
         y = y - this.mouseY;
-        
+
         var bgX = Math.ceil(x + this.previewEl.getLeft(true));
         var bgY = Math.ceil(y + this.previewEl.getTop(true));
         
-        bgX = (minX < bgX) ? minX : ((maxX > bgX) ? maxX : bgX);
-        bgY = (minY < bgY) ? minY : ((maxY > bgY) ? maxY : bgY);
+        bgX = (bgX < minX) ? minX : ((bgX > maxX) ? maxX : bgX);
+        bgY = (bgY < minY) ? minY : ((bgY > maxY) ? maxY : bgY);
         
         this.previewEl.setLeft(bgX);
         this.previewEl.setTop(bgY);
@@ -68625,10 +68621,15 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         this.startScale = this.scale;
         this.scale = (e.getWheelDelta() == 1) ? (this.scale + 1) : (this.scale - 1);
+        
+        console.log("START SCALE:" + this.startScale);
+        console.log("TEST SCALE: " + this.scale);
         if(!this.zoomable()){
             this.scale = this.startScale;
             return;
         }
+
+        console.log("END SCALE: " + this.scale);
         
         this.draw();
         
@@ -68642,10 +68643,15 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         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);
 
+        console.log("WIDTH: " + width);
+        console.log("HEIGHT: " + height);
+
         var maxWidth = this.imageEl.OriginWidth;
         var maxHeight = this.imageEl.OriginHeight;
         
@@ -68910,6 +68916,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     crop : function()
     {
+        console.log("crop");
         if(!this.canvasLoaded){
             return;
         }
@@ -69092,7 +69099,6 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
                 }
                 
                 context.scale(scale, scale);
-                
                 var sx = Math.min(this.canvasEl.width - this.thumbEl.getWidth(), this.thumbEl.getLeft(true) - this.previewEl.getLeft(true));
                 var sy = Math.min(this.canvasEl.height - this.thumbEl.getHeight(), this.thumbEl.getTop(true) - this.previewEl.getTop(true));
 
@@ -69109,6 +69115,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         }
         
         this.cropData = canvas.toDataURL(this.cropType);
+
+        console.log("cropData");
+        console.log(this.cropData);
         
         if(this.fireEvent('crop', this, this.cropData) !== false){
             this.process(this.file, this.cropData);
@@ -69354,6 +69363,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     process : function(file, crop)
     {
+        console.log("process");
         if(this.loadMask){
             this.maskEl.mask(this.loadingText);
         }
@@ -69362,6 +69372,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         file.xhr = this.xhr;
 
+        console.log("METHOD:" + this.method);
+        console.log("URL: " + this.url); 
         this.xhr.open(this.method, this.url, true);
         
         var headers = {
@@ -69391,6 +69403,9 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var formData = new FormData();
 
+        formData.append("onid", "43024");
+        formData.append("ontable", "pressrelease_boilerplate");
+
         formData.append('returnHTML', 'NO');
         
         if(crop){
@@ -69408,6 +69423,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         if(typeof(file.mimetype) != 'undefined'){
             formData.append('mimetype', file.mimetype);
         }
+
+        console.log(formData);
         
         if(this.fireEvent('arrange', this, formData) != false){
             this.xhr.send(formData);
@@ -69416,6 +69433,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     xhrOnLoad : function(xhr)
     {
+        console.log("xhrOnLoad");
+        console.log(xhr);
         if(this.loadMask){
             this.maskEl.unmask();
         }