projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uncommited changes synced
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
acfeffc
..
9fb6be0
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-40493,7
+40493,9
@@
Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, {
this.el.update(content, loadScripts);
},
this.el.update(content, loadScripts);
},
- ignoreResize : function(w, h){
+ ignoreResize : function(w, h)
+ {
+ return false; // always resize?
if(this.lastSize && this.lastSize.width == w && this.lastSize.height == h){
return true;
}else{
if(this.lastSize && this.lastSize.width == w && this.lastSize.height == h){
return true;
}else{
@@
-40898,7
+40900,11
@@
Roo.bootstrap.panel.Grid = function(config)
};
};
-Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content, {
+Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content,
+{
+ // private
+ is_resizing : false,
+
getId : function(){
return this.grid.id;
},
getId : function(){
return this.grid.id;
},
@@
-40911,7
+40917,13
@@
Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content, {
return this.grid;
},
return this.grid;
},
- setSize : function(width, height){
+ setSize : function(width, height)
+ {
+ if (this.is_resizing) {
+ return;
+
+ }
+ this.is_resizing = true;
if(!this.ignoreResize(width, height)){
var grid = this.grid;
var size = this.adjustForComponents(width, height);
if(!this.ignoreResize(width, height)){
var grid = this.grid;
var size = this.adjustForComponents(width, height);
@@
-40941,6
+40953,7
@@
Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content, {
grid.autoSize();
}
grid.autoSize();
}
+ this.is_resizing = false;
},
},