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
3cc953f
..
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
-
-
+
});
});
@@
-295,12
+294,10
@@
panel.load({
adjustForComponents : function(width, height)
{
adjustForComponents : function(width, height)
{
- Roo.log('adjustForComponents ');
- Roo.log([width, height]);
+ //Roo.log('adjustForComponents ');
if(this.resizeEl != this.el){
width -= this.el.getFrameWidth('lr');
height -= this.el.getFrameWidth('tb');
if(this.resizeEl != this.el){
width -= this.el.getFrameWidth('lr');
height -= this.el.getFrameWidth('tb');
- Roo.log([width, height]);
}
if(this.toolbar){
var te = this.toolbar.getEl();
}
if(this.toolbar){
var te = this.toolbar.getEl();
@@
-309,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);