Author: konstantin.mishin
Date: 2007-12-11 12:50:14 -0500 (Tue, 11 Dec 2007)
New Revision: 4730
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-1453
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
---
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11
17:45:27 UTC (rev 4729)
+++
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11
17:50:14 UTC (rev 4730)
@@ -249,15 +249,6 @@
this.scrollBox.setHeight(this.getHeight()+1);
this.scrollBox.setWidth(this.getWidth());
this.scrollBox.setHeight(this.getHeight());
- var viewWidth = this.scrollBox.getViewportWidth();
- this.container.setWidth(viewWidth);
-
- if(ClientUILib.isIE) {
- this.contentBox.setWidth(viewWidth - frozenContentWidth);
- }
- else {
- this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
- }
height = this.scrollBox.getElement().clientHeight;
@@ -269,18 +260,26 @@
this.defaultRowHeight = this._calcDefaultRowHeight();
this.sizeBox.hide();
this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
- this.sizeBox.show();
this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
-
- var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft);
- this.grid.adjustScrollPosition(scrollPos);
this.dataVisible = parseInt(this.contentBox.getHeight() / this.defaultRowHeight, 10) +
1;
this.dataVisible = Math.min(this.dataVisible, this.rowsCount);
if(height > 0) {
this.adjustDataPosition(this.currentPos);
}
+ this.sizeBox.show();
+ var viewWidth = this.scrollBox.getViewportWidth();
+ this.container.setWidth(viewWidth);
+
+ if(ClientUILib.isIE) {
+ this.contentBox.setWidth(viewWidth - frozenContentWidth);
+ }
+ else {
+ this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
+ }
+ var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft);
+ this.grid.adjustScrollPosition(scrollPos);
},
adjustScrollPosition: function(pos) {
this.templNormal.moveToX(-pos);