*/
Roo.ContentPanel = function(el, config, content){
- console.log("ContentPanel Constructor");
/*
if(el.autoCreate || el.xtype){ // xtype is available if this is called from factory
config = el;
*/
Roo.dialog.UploadCropbox = function(config){
- console.log("Dialog UploadCropbox Constructor");
Roo.dialog.UploadCropbox.superclass.constructor.call(this, config);
this.addEvents({
* @param {Roo.dialog.UploadCropbox} this
* @param {Object} formData
*/
- "arrange" : true
+ "arrange" : true,
+ /**
+ * @event loadcanvas
+ * Fire after load the canvas
+ * @param {Roo.dialog.UploadCropbox}
+ * @param {Object} imgEl
+ */
+ "loadcanvas" : true
});
this.buttons = this.buttons || Roo.dialog.UploadCropbox.footer.STANDARD;
this.initEvents();
}
-
- return;
}
+ else {
+ var cfg = Roo.apply({}, this.getAutoCreate());
-
-
- var cfg = Roo.apply({}, this.getAutoCreate());
-
- cfg.id = this.id || Roo.id();
-
- // fill in the extra attributes
- if (this.xattr && typeof(this.xattr) =='object') {
- for (var i in this.xattr) {
- cfg[i] = this.xattr[i];
+ cfg.id = this.id || Roo.id();
+
+ if (this.cls) {
+ cfg.cls = (typeof(cfg.cls) == 'undefined' ? this.cls : cfg.cls) + ' ' + this.cls;
}
+
+ if (this.style) { // fixme needs to support more complex style data.
+ cfg.style = (typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' + this.style;
+ }
+
+ this.el = ct.createChild(cfg, position);
+
+ this.initEvents();
}
- if(this.dataId){
- cfg.dataId = this.dataId;
- }
-
- if (this.cls) {
- cfg.cls = (typeof(cfg.cls) == 'undefined' ? this.cls : cfg.cls) + ' ' + this.cls;
- }
-
- if (this.style) { // fixme needs to support more complex style data.
- cfg.style = (typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' + this.style;
- }
-
- if(this.name){
- cfg.name = this.name;
- }
-
- this.el = ct.createChild(cfg, position);
-
- if (this.tooltip) {
- this.tooltipEl().attr('tooltip', this.tooltip);
- }
-
- if(this.tabIndex !== undefined){
- this.el.dom.setAttribute('tabIndex', this.tabIndex);
- }
-
- this.initEvents();
-
if (this.buttons.length) {
Roo.each(this.buttons, function(bb) {
this.cropData = false;
this.notifyEl.dom.innerHTML = this.emptyText;
- this.selectorEl.dom.value = '';
+ // this.selectorEl.dom.value = '';
},
e.preventDefault();
if(typeof(this.selectorEl.dom.files) == 'undefined' || !this.selectorEl.dom.files.length){
+ console.log("EMPTY RETURN");
return;
}
{
this.imageEl.OriginWidth = this.imageEl.naturalWidth || this.imageEl.width;
this.imageEl.OriginHeight = this.imageEl.naturalHeight || this.imageEl.height;
-
- this.bodyEl.un('click', this.beforeSelectFile, this);
-
- this.notifyEl.hide();
- this.thumbEl.show();
- this.footerEl.show();
-
- this.baseRotateLevel();
-
- if(this.isDocument){
- this.setThumbBoxSize();
+
+ var _this = 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(res) {
+ //_this.selectorEl.dom.value = '';
+ console.log(_this.selectorEl.dom.value);
+ _this.selectorEl.dom.click();
+ }
+ });
}
+
+ if(this.fireEvent('loadcanvas', this, this.imageEl) != false){
- this.setThumbBoxPosition();
-
- this.baseScaleLevel();
-
- this.draw();
-
- this.resize();
+ 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;
- this.canvasLoaded = true;
+ }
if(this.loadMask){
this.maskEl.unmask();
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);
+ console.log("maxWidth: " + maxWidth);
+ console.log("maxHeight: " + maxHeight);
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
+ width < this.minWidth ||
+ height < this.minHeight ||
+ width > maxWidth ||
+ 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)
projects / roojs1 / blobdiff