projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow string based values for comboboxarray
[roojs1]
/
Roo
/
ContentPanel.js
diff --git
a/Roo/ContentPanel.js
b/Roo/ContentPanel.js
index
4571ad8
..
29f2a68
100644
(file)
--- a/
Roo/ContentPanel.js
+++ b/
Roo/ContentPanel.js
@@
-130,8
+130,7
@@
Roo.ContentPanel = function(el, config, content){
* @param {Roo.ContentPanel} this
*/
"render" : true
* @param {Roo.ContentPanel} this
*/
"render" : true
-
-
+
});
});
@@
-159,13
+158,10
@@
Roo.ContentPanel = function(el, config, content){
Roo.ContentPanel.superclass.constructor.call(this);
Roo.ContentPanel.superclass.constructor.call(this);
-
if (this.view && typeof(this.view.xtype) != 'undefined') {
+ 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.el = this.el.appendChild(document.createElement("div"));
this.view = Roo.factory(this.view);
- this.view.render && this.on('render',
- function() {
- this.view.render(false, '',this);
- }, this); // render blank..
+ this.view.render && this.view.render(false, '');
}
}
@@
-310,7
+306,7
@@
panel.load({
}
if(this.footer){
var te = this.footer.getEl();
}
if(this.footer){
var te = this.footer.getEl();
- Roo.log("footer:" + te.getHeight());
+
//
Roo.log("footer:" + te.getHeight());
height -= te.getHeight();
te.setWidth(width);
height -= te.getHeight();
te.setWidth(width);
@@
-436,7
+432,9
@@
layout.addxtype({
this.form = new Roo.form.Form(cfg);
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..
return this.form;
}
// should only have one of theses..