*/
Roo.dialog.UploadCropbox = function(config){
- console.log("Dialog UploadCropbox Constructor");
Roo.dialog.UploadCropbox.superclass.constructor.call(this, config);
this.addEvents({
this.cropData = false;
this.notifyEl.dom.innerHTML = this.emptyText;
- console.log("RESET SELECTOR EL")
- this.selectorEl.dom.value = '';
+ // this.selectorEl.dom.value = '';
},
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;
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);
if(
this.isDocument &&
!this.isDocument &&
(this.rotate == 0 || this.rotate == 180) &&
(
- width < this.minWidth ||
- width > this.imageEl.OriginWidth ||
- height < this.minHeight ||
- height > this.imageEl.OriginHeight
+ (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) ||
+ height > maxHeight
)
){
return false;
getScaleLevel : function()
{
- return this.baseScale * Math.pow(1.1, this.scale);
+ console.log("BASESCALE: " + this.baseScale);
+ return this.baseScale * Math.pow(1.02, this.scale);
},
onTouchStart : function(e)