Merge branch 'master' of http://git.roojs.com/roojs1

diff --git a/Roo/bootstrap/UploadCropbox.js b/Roo/bootstrap/UploadCropbox.js
index d15d422..d1cd96d 100644 (file)
--- a/Roo/bootstrap/UploadCropbox.js
+++ b/Roo/bootstrap/UploadCropbox.js
@@ -744,8 +744,9 @@ Roo.extend(Roo.bootstrap.UploadCropbox, Roo.bootstrap.Component,  {
                 var x = (this.thumbEl.getLeft(true) > this.previewEl.getLeft(true)) ? 0 : (this.thumbEl.getLeft(true) - this.previewEl.getLeft(true));
                 var y = (this.thumbEl.getTop(true) > this.previewEl.getTop(true)) ? 0 : (this.thumbEl.getTop(true) - this.previewEl.getTop(true));
                 
-                var scaleWidth = (width > this.minWidth) ? (this.minWidth / width) : 1;
-                var scaleHeight = (height > this.minHeight) ? (this.minHeight / height) : 1;
+                if()
+//                var scaleWidth = (width > this.minWidth) ? (this.minWidth / width) : 1;
+//                var scaleHeight = (height > this.minHeight) ? (this.minHeight / height) : 1;
 //                
 //                Roo.log([scaleWidth, scaleHeight]);
                 
@@ -765,7 +766,7 @@ Roo.extend(Roo.bootstrap.UploadCropbox, Roo.bootstrap.Component,  {
 //                Roo.log([scaleWidth, scaleHeight]);
                 
 //                if(!this.isDocument){
-                    context.scale(scaleWidth, scaleHeight);
+//                    context.scale(scaleWidth, scaleHeight);
 //                }