X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FResizable.js;h=b0fb9f3b3f0435b26897c56cfb97d7d9820097a9;hb=75cbc4ce04c9c01ac47671cb01320ce699128d00;hp=f0b1cf741b27954b628c1650f9fbbbdca936f31f;hpb=7a5e26589eaeef5581e1660ae8aad382f7b3e7cc;p=roojs1 diff --git a/Roo/Resizable.js b/Roo/Resizable.js index f0b1cf741b..b0fb9f3b3f 100644 --- a/Roo/Resizable.js +++ b/Roo/Resizable.js @@ -163,11 +163,9 @@ Roo.Resizable = function(el, config) } if(this.draggable){ - Roo.log('in11?'); - Roo.log(this.resizeChild ); -// this.dd = this.dynamic ? -// this.el.initDD(null) : this.el.initDDProxy(null, {dragElId: this.proxy.id}); - //this.dd.setHandleElId(this.resizeChild ? this.resizeChild.id : this.el.id); + this.dd = this.dynamic ? + this.el.initDD(null) : this.el.initDDProxy(null, {dragElId: this.proxy.id}); + this.dd.setHandleElId(this.resizeChild ? this.resizeChild.id : this.el.id); } // public events @@ -179,6 +177,17 @@ Roo.Resizable = function(el, config) * @param {Roo.EventObject} e The mousedown event */ "beforeresize" : true, + /** + * @event resizing + * Fired a resizing. + * @param {Roo.Resizable} this + * @param {Number} x The new x position + * @param {Number} y The new y position + * @param {Number} w The new w width + * @param {Number} h The new h hight + * @param {Roo.EventObject} e The mouseup event + */ + "resizing" : true, /** * @event resize * Fired after a resize. @@ -313,7 +322,6 @@ Roo.extend(Roo.Resizable, Roo.util.Observable, { updateChildSize : function(){ if(this.resizeChild){ - Roo.log('in?'); var el = this.el; var child = this.resizeChild; var adj = this.adjustments; @@ -338,7 +346,9 @@ Roo.extend(Roo.Resizable, Roo.util.Observable, { // private snap : function(value, inc, min){ - if(!inc || !value) return value; + if(!inc || !value) { + return value; + } var newValue = value; var m = value % inc; if(m > 0){ @@ -378,6 +388,7 @@ Roo.extend(Roo.Resizable, Roo.util.Observable, { // private onMouseMove : function(e){ + if(this.enabled){ try{// try catch so if something goes wrong the user doesn't get hung @@ -554,6 +565,7 @@ Roo.extend(Roo.Resizable, Roo.util.Observable, { } }catch(e){} } + this.fireEvent("resizing", this, x, y, w, h, e); }, // private @@ -655,6 +667,7 @@ Roo.Resizable.Handle = function(rz, pos, disableTrackOver, transparent){ // private Roo.Resizable.Handle.prototype = { afterResize : function(rz){ + Roo.log('after?'); // do nothing }, // private