X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FContentPanel.js;h=29f2a68cebd74bc7752fcd495cc91a819e25bb9d;hb=61bc45258e16a779856dd2ad0862630b489e4583;hp=7de96e15e5a65e4147ffc259af577b5b5d8f3492;hpb=b0d24a82f35e9f26539f54d39cd3e6e5b9bd0d6f;p=roojs1 diff --git a/Roo/ContentPanel.js b/Roo/ContentPanel.js index 7de96e15e5..29f2a68ceb 100644 --- a/Roo/ContentPanel.js +++ b/Roo/ContentPanel.js @@ -98,12 +98,7 @@ Roo.ContentPanel = function(el, config, content){ } // handle view.xtype - if (this.view && typeof(this.view.xtype) != 'undefined') { - this.view.el = this.el.appendChild(document.createElement("div")); - this.view = Roo.factory(this.view); - this.view.render && this.view.render(false, ''); // render blank.. - } - + this.addEvents({ @@ -135,10 +130,13 @@ Roo.ContentPanel = function(el, config, content){ * @param {Roo.ContentPanel} this */ "render" : true - - + }); + + + + if(this.autoScroll){ this.resizeEl.setStyle("overflow", "auto"); } else { @@ -160,6 +158,13 @@ Roo.ContentPanel = function(el, config, content){ Roo.ContentPanel.superclass.constructor.call(this); + if (this.view && typeof(this.view.xtype) != 'undefined') { + this.view.el = this.el.appendChild(document.createElement("div")); + this.view = Roo.factory(this.view); + this.view.render && this.view.render(false, ''); + } + + this.fireEvent('render', this); }; @@ -301,7 +306,7 @@ panel.load({ } if(this.footer){ var te = this.footer.getEl(); - Roo.log("footer:" + te.getHeight()); + //Roo.log("footer:" + te.getHeight()); height -= te.getHeight(); te.setWidth(width); @@ -427,17 +432,21 @@ layout.addxtype({ this.form = new Roo.form.Form(cfg); - if ( this.form.allItems.length) this.form.render(el.dom); + if ( this.form.allItems.length) { + this.form.render(el.dom); + } return this.form; } // should only have one of theses.. - if (['View', 'JsonView', 'DatePicker'].indexOf(cfg.xtype) > -1) { - // views.. + if ([ 'View', 'JsonView', 'DatePicker'].indexOf(cfg.xtype) > -1) { + // views.. should not be just added - used named prop 'view'' + cfg.el = this.el.appendChild(document.createElement("div")); // factory? var ret = new Roo.factory(cfg); - ret.render && ret.render(false, ''); // render blank.. + + ret.render && ret.render(false, ''); // render blank.. this.view = ret; return ret; }