[richfaces-svn-commits] JBoss Rich Faces SVN: r2479 - in trunk/ui/scrollableDataTable/src/main: javascript/ClientUI/controls/grid and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: konstantin.mishin
Date: 2007-08-24 10:16:46 -0400 (Fri, 24 Aug 2007)
New Revision: 2479

Modified:
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
Log:
RF-661

Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java	2007-08-24 14:10:14 UTC (rev 2478)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java	2007-08-24 14:16:46 UTC (rev 2479)
@@ -229,7 +229,7 @@
 	 * @return Returns the rowIndex.
 	 */
 	public int getRowIndex() {
-		if(_rowIndex >= _grid.getRows()){
+		if((_grid.getRows() != 0 && _rowIndex >= _grid.getRows()) || _rowIndex >= _grid.getRowCount()){
 			_rowIndex = 0;
 		}	
 		return _rowIndex;

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-08-24 14:10:14 UTC (rev 2478)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js	2007-08-24 14:16:46 UTC (rev 2479)
@@ -765,7 +765,7 @@
 		} else if(rowIndex == "down") {
 			this.scrollBox.getElement().scrollTop = this.scrollBox.getElement().scrollTop + this.fTable.rows[1].offsetTop;
 		} else {
-			var row = $(this.gridId + ":f:" + rowIndex);
+			var row = $(this.gridId + ":n:" + rowIndex);
 			var offsetTop = this.fTable.offsetTop + row.offsetTop;
 			if(this.frozenContentBox.getElement().scrollTop > offsetTop) {
 				this.scrollBox.getElement().scrollTop = offsetTop;

Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js	2007-08-24 14:10:14 UTC (rev 2478)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js	2007-08-24 14:16:46 UTC (rev 2479)
@@ -326,7 +326,7 @@
 		var range, rowIndex;
 		var activeRow = this.activeRow;
 		var noDefault = false;
-		this.firstIndex = Number($(this.prefix + ":f").rows[0].id.split(this.prefix)[1].split(":")[2]);;
+		this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);;
 		switch (event.keyCode || event.charCode) {
 			case Event.KEY_UP:
 				if (this.inFocus && activeRow != null) {
@@ -403,7 +403,7 @@
 		}		
 		var range;
 		if ( event.shiftKey && !event.ctrlKey && !event.altKey) {
-			this.firstIndex = Number($(this.prefix + ":f").rows[0].id.split(this.prefix)[1].split(":")[2]);;
+			this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);;
 			this.selectionFlag = "x";
 			if(!this.shiftRow) {
 				this.shiftRow = this.activeRow;