projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix layout resize and show on dialogs
[roojs1]
/
Roo
/
bootstrap
/
panel
/
Grid.js
diff --git
a/Roo/bootstrap/panel/Grid.js
b/Roo/bootstrap/panel/Grid.js
index
2357882
..
890ce7a
100644
(file)
--- a/
Roo/bootstrap/panel/Grid.js
+++ b/
Roo/bootstrap/panel/Grid.js
@@
-98,9
+98,7
@@
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;
},
@@
-115,12
+113,8
@@
Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content,
setSize : function(width, height)
{
setSize : function(width, height)
{
- if (this.is_resizing) {
- return;
-
- }
- this.is_resizing = true;
- if(!this.ignoreResize(width, height)){
+
+ //if(!this.ignoreResize(width, height)){
var grid = this.grid;
var size = this.adjustForComponents(width, height);
// tfoot is not a footer?
var grid = this.grid;
var size = this.adjustForComponents(width, height);
// tfoot is not a footer?
@@
-148,8
+142,8
@@
Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content,
//}
grid.autoSize();
//}
grid.autoSize();
- }
- this.is_resizing = false;
+
//
}
+
},
},