[richfaces-svn-commits] JBoss Rich Faces SVN: r9288 - in trunk/ui/scrollableDataTable/src/main: javascript/ClientUI/controls/grid and 1 other directory.
Author: konstantin.mishin
Date: 2008-06-28 08:57:36 -0400 (Sat, 28 Jun 2008)
New Revision: 9288
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-2995
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
---
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-06-28
11:40:01 UTC (rev 9287)
+++
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-06-28
12:57:36 UTC (rev 9288)
@@ -616,9 +616,7 @@
protected void doDecode(FacesContext context, UIComponent component) {
super.doDecode(context, component);
-
- composite.decode(context, component);
-
+
component.getAttributes().remove(PARTIAL_UPDATE);
component.getAttributes().remove(UPDATE_HEADER);
@@ -642,7 +640,10 @@
grid.setFirst(Integer.parseInt(options.split(",")[1]));
}
}
+ int value = grid.getFirst() % grid.getRows();
+ component.getAttributes().put(ScrollableDataTableUtils.CLIENT_ROW_KEY, value);
+ composite.decode(context, component);
if(parameters.containsKey(clientId + ":sortColumn") &&
parameters.containsKey(clientId + ":sortStartRow") &&
@@ -766,7 +767,6 @@
writer.endElement("tbody");
writer.endElement("table");
-
String id = client_id+"_rows_input";
writer.startElement(HTML.INPUT_ELEM, grid);
writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
@@ -791,8 +791,6 @@
if (shouldUpdateHeader(component)) {
ColumnWalker.iterateOverColumns(context, component, headerRenderer, writer, new
ScrollableDataTableRendererState(context, null, grid));
}
-
-
}
private ScrollableDataTableScrollData createOptions(UIScrollableDataTable grid){
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
---
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-06-28
11:40:01 UTC (rev 9287)
+++
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-06-28
12:57:36 UTC (rev 9288)
@@ -333,7 +333,7 @@
var startRowIndx = 0;
var countToLoad = 0;
- this.scrollInput.value = task.pos + "," + range.start + "," +
range.end;
+ this.scrollInput.value = task.pos + "," + this.currRange.start +
"," + this.currRange.end;
// if we have intersepted ranges than rearrange rows
// in other case just move rows table to first position
@@ -390,6 +390,7 @@
ClientUILib.log(ClientUILogger.WARNING, "Start loading: index: " +
startIndex + ", and startRow: " + startRowIndx + ", and count: " +
countToLoad);
this.currRange = range;
this.currentPos = task.pos;
+ this.scrollInput.value = task.pos + "," + this.currRange.start +
"," + this.currRange.end;
if (this.grid.options.hideWhenScrolling) {