Author: konstantin.mishin Date: 2010-04-12 11:00:43 -0400 (Mon, 12 Apr 2010) New Revision: 16756 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js Log: small fixes Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-04-09 18:52:56 UTC (rev 16755) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-04-12 15:00:43 UTC (rev 16756) @@ -487,7 +487,7 @@ writer.startElement(HTML.TBOBY_ELEMENT, table); writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":tb" + partName.toString().charAt(0), null); - table.walk(context, this, state); // TODO encodeRows(context, table); + encodeRows(state); writer.endElement(HTML.TBOBY_ELEMENT); writer.endElement(HTML.TABLE_ELEMENT); writer.endElement(HTML.DIV_ELEM); @@ -661,7 +661,7 @@ } else { updateAttribute(context, component.findComponent(values[0]), "filterValue", values[1]); } - context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); // Use partial re-rendering here. + context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); // TODO Use partial re-rendering here. } } @@ -690,13 +690,13 @@ sortPriority.add(values[0]); } updateAttribute(context, component, "sortPriority", sortPriority); - context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); // Use partial re-rendering here. + context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); // TODO Use partial re-rendering here. } } /** * @deprecated - * TODO Remove this method when width in relative units in columns will be implimented. + * TODO Remove this method when width in relative units in columns will be implemented. * @param column * @return width */ Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-04-09 18:52:56 UTC (rev 16755) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-04-12 15:00:43 UTC (rev 16756) @@ -79,7 +79,7 @@ var updateLayout = function() { var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0; var width = Math.max(0, element.clientWidth - offsetWidth); - if (width) { + if (width && scrollElement) { normalPartStyle.width = width + "px"; normalPartStyle.display = ""; var delta = scrollElement.firstChild.offsetHeight - scrollElement.clientHeight; @@ -101,7 +101,7 @@ }; var adjustResizers = function() { - var scrollLeft = scrollElement.scrollLeft; + var scrollLeft = scrollElement ? scrollElement.scrollLeft : 0; var clientWidth = element.clientWidth - 3; var i = 0; for (; i < frozenColumnCount; i++) { @@ -137,13 +137,16 @@ } }; - var updateScrollPosition = function() { - var scrollLeft = scrollElement.scrollLeft; - for (var i = 0; i < idSuffixs.length; i++) { - document.getElementById(id + idSuffixs[i]).scrollLeft = scrollLeft;//TODO Not use getElementById here - } - adjustResizers(); - }; + if (scrollElement) { + var updateScrollPosition = function() { + var scrollLeft = scrollElement.scrollLeft; + for (var i = 0; i < idSuffixs.length; i++) { + document.getElementById(id + idSuffixs[i]).scrollLeft = scrollLeft;//TODO Not use getElementById here + } + adjustResizers(); + }; + jQuery(scrollElement).bind("scroll", updateScrollPosition); + } var initializeLayout = function() { //TODO Use "var rowHeight" instead of "dataTableElement.offsetHeight / rows" @@ -151,7 +154,9 @@ contentElement.style.height = (rowCount * dataTableElement.offsetHeight / rows) + "px"; } updateLayout(); - updateScrollPosition(); //TODO Restore horizontal scroll position + if (scrollElement) { + updateScrollPosition(); //TODO Restore horizontal scroll position + } }; var drag = function(event) { @@ -274,7 +279,6 @@ jQuery(document).ready(initializeLayout); jQuery(window).bind("resize", updateLayout); - jQuery(scrollElement).bind("scroll", updateScrollPosition); jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer").bind("mousedown", beginResize); jQuery(element).children(".rich-extable-header").find(".rich-extable-header-cell").bind("mousedown", beginReorder); jQuery(bodyElement).bind("scroll", bodyScrollListener);