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
7de96e1
..
29f2a68
100644
(file)
--- a/
Roo/ContentPanel.js
+++ b/
Roo/ContentPanel.js
@@
-98,12
+98,7
@@
Roo.ContentPanel = function(el, config, content){
}
// handle view.xtype
}
// 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({
this.addEvents({
@@
-135,10
+130,13
@@
Roo.ContentPanel = function(el, config, content){
* @param {Roo.ContentPanel} this
*/
"render" : true
* @param {Roo.ContentPanel} this
*/
"render" : true
-
-
+
});
});
+
+
+
+
if(this.autoScroll){
this.resizeEl.setStyle("overflow", "auto");
} else {
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);
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);
};
this.fireEvent('render', this);
};
@@
-301,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);
@@
-427,17
+432,21
@@
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..
- 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);
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;
}
this.view = ret;
return ret;
}