projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #6883 - image loading tidy up
[roojs1]
/
Roo
/
bootstrap
/
panel
/
Content.js
diff --git
a/Roo/bootstrap/panel/Content.js
b/Roo/bootstrap/panel/Content.js
index
ed26ba6
..
93691e5
100644
(file)
--- a/
Roo/bootstrap/panel/Content.js
+++ b/
Roo/bootstrap/panel/Content.js
@@
-172,7
+172,15
@@
Roo.bootstrap.panel.Content = function( config){
* Fires when this tab is created
* @param {Roo.ContentPanel} this
*/
* Fires when this tab is created
* @param {Roo.ContentPanel} this
*/
- "render" : true
+ "render" : true,
+
+ /**
+ * @event scroll
+ * Fires when this content is scrolled
+ * @param {Roo.ContentPanel} this
+ * @param {Event} scrollEvent
+ */
+ "scroll" : true
@@
-183,6
+191,7
@@
Roo.bootstrap.panel.Content = function( config){
if(this.autoScroll && !this.iframe){
this.resizeEl.setStyle("overflow", "auto");
if(this.autoScroll && !this.iframe){
this.resizeEl.setStyle("overflow", "auto");
+ this.resizeEl.on('scroll', this.onScroll, this);
} else {
// fix randome scrolling
//this.el.on('scroll', function() {
} else {
// fix randome scrolling
//this.el.on('scroll', function() {
@@
-222,6
+231,9
@@
Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, {
iframe : false,
iframeEl : false,
iframe : false,
iframeEl : false,
+ /* Resize Element - use this to work out scroll etc. */
+ resizeEl : false,
+
setRegion : function(region){
this.region = region;
this.setActiveClass(region && !this.background);
setRegion : function(region){
this.region = region;
this.setActiveClass(region && !this.background);
@@
-531,6
+543,12
@@
layout.addxtype({
getChildContainer: function () {
return this.getEl();
getChildContainer: function () {
return this.getEl();
+ },
+
+
+ onScroll : function(e)
+ {
+ this.fireEvent('scroll', this, e);
}
}