[richfaces-svn-commits] JBoss Rich Faces SVN: r2151 - in trunk/ui/scrollable-grid/src/main: javascript and 1 other directories.

Author: maksimkaszynski Date: 2007-08-08 11:25:04 -0400 (Wed, 08 Aug 2007) New Revision: 2151 Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js Log: http://jira.jboss.com/jira/browse/RF-518 Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-08 14:44:32 UTC (rev 2150) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-08 15:25:04 UTC (rev 2151) @@ -278,7 +278,7 @@ writer.startElement(HTML.TR_ELEMENT, grid); state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid)); getUtils().writeAttribute(writer, "id",row_id); - getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(index)); + getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(index)); if (log.isDebugEnabled()) { log.debug("rowIndex : " + index); @@ -287,7 +287,7 @@ ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state); if(!state.isFrozenPart()){ writer.startElement("td", grid); - getUtils().writeAttribute(writer, "class","dr-sgrid-bc " + state.getColumnClass(state.getCellIndex())); + getUtils().writeAttribute(writer, "class","dr-sgrid-bc rich-sgrid-row" + state.getColumnClass(state.getCellIndex())); writer.endElement("td"); } writer.endElement(HTML.TR_ELEMENT); @@ -337,7 +337,7 @@ row_id = baseClientId + ":f:" + state.getRowIndex(); writer.startElement("tr", grid); - getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(state.getRowIndex())); + getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(state.getRowIndex())); getUtils().writeAttribute(writer,"id",row_id); collection.add(row_id); @@ -352,7 +352,7 @@ writer.startElement("tr", grid); getUtils().writeAttribute(writer,"id",row_id); - getUtils().writeAttribute(writer, "class","dr-sgrid-rb " + state.getRowClass(state.getRowIndex())); + getUtils().writeAttribute(writer, "class","dr-sgrid-rb rich-sgrid-row" + state.getRowClass(state.getRowIndex())); normalTRRendered = true; collection.add(row_id); Modified: trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-08 14:44:32 UTC (rev 2150) +++ trunk/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-08 15:25:04 UTC (rev 2151) @@ -180,8 +180,8 @@ } this.rowsCount = Math.min(templNormal.rows.length, this.grid.dataModel.getCount()); - var cell = templNormal.rows[0].cells[0]; - this.defaultRowHeight = cell!=null ? Element.getHeight(cell) : 0; + + this.defaultRowHeight = this._calcDefaultRowHeight(); //if(ClientUILib.isGecko) { // this.defaultRowHeight -= this.getBorderWidth("tb") + this.getPadding("tb"); //} @@ -202,6 +202,13 @@ } }, updateSize: function() { + + var defHeight = this._calcDefaultRowHeight(); + + if (isFinite(defHeight)) { + this.defaultRowHeight = defHeight; + } + var row = this.templNormal.getElement().rows[0]; if(row) { this.defaultRowHeight = Element.getHeight(row.cells[0]); @@ -764,5 +771,11 @@ } } this.scrollBox.updateScrollPos(); + }, + + _calcDefaultRowHeight: function() { + var templNormal = this.templNormal.getElement(); + return Math.ceil(templNormal.offsetHeight / templNormal.rows.length); + } }); Modified: trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js =================================================================== --- trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js 2007-08-08 14:44:32 UTC (rev 2150) +++ trunk/ui/scrollable-grid/src/main/javascript/ClientUILib.js 2007-08-08 15:25:04 UTC (rev 2151) @@ -83,9 +83,18 @@ this.packages[libName] = true; }, log: function(level, infoText) { - if(ClientUILogger.isCreated) + if(ClientUILogger.isCreated){ ClientUILogger.log(level, infoText); + } else { + switch(level) { + case ClientUILogger.INFO: LOG.info(infoText); break; + case ClientUILogger.ERROR: LOG.error(infoText); break; + case ClientUILogger.WARNING: LOG.warn(infoText); break; + default: LOG.a4jDebug(infoText);; + } + } }, + initBrowser: function() { var ua = navigator.userAgent.toLowerCase(); /** @type Boolean */ @@ -205,7 +214,7 @@ } }; -ClientUILib.load(true); +ClientUILib.load(); // declare predefined packages var ClientUI = {