projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f89764f
)
Roo/ContentPanel.js
author
Alan Knowles
<alan@akkbhome.com>
Tue, 28 Dec 2010 13:36:39 +0000
(21:36 +0800)
committer
Alan Knowles
<alan@akkbhome.com>
Tue, 28 Dec 2010 13:36:39 +0000
(21:36 +0800)
Roo/ContentPanel.js
patch
|
blob
|
history
diff --git
a/Roo/ContentPanel.js
b/Roo/ContentPanel.js
index
b891df3
..
2df80c8
100644
(file)
--- a/
Roo/ContentPanel.js
+++ b/
Roo/ContentPanel.js
@@
-109,6
+109,8
@@
Roo.ContentPanel = function(el, config, content){
});
if(this.autoScroll){
this.resizeEl.setStyle("overflow", "auto");
+ } else {
+ this.el.on('scroll', this.el.scrollTop);
}
content = content || this.content;
if(content){
@@
-475,6
+477,7
@@
Roo.NestedLayoutPanel = function(layout, config)
}
*/
+
Roo.NestedLayoutPanel.superclass.constructor.call(this, layout.getEl(), config);
layout.monitorWindowResize = false; // turn off autosizing
@@
-483,6
+486,7
@@
Roo.NestedLayoutPanel = function(layout, config)
+
};
Roo.extend(Roo.NestedLayoutPanel, Roo.ContentPanel, {