Author: konstantin.mishin
Date: 2010-06-13 10:29:14 -0400 (Sun, 13 Jun 2010)
New Revision: 17622
Modified:
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-5733
Modified:
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-06-13
00:41:34 UTC (rev 17621)
+++
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-06-13
14:29:14 UTC (rev 17622)
@@ -23,7 +23,6 @@
overflow: hidden;
background-color: '#{richSkin.tableBackgroundColor}';
border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
- /*height: 100%;*/
}
.rf-edt-h, .rf-edt-th {
@@ -42,8 +41,7 @@
.rf-edt-s {
height: 0px;
- /*font-size: 0px;
- line-height: 0px;*/
+ font-size: 0px; /*for IE7 only*/
}
.rf-edt-f, .rf-edt-tf {
Modified:
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
---
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-06-13
00:41:34 UTC (rev 17621)
+++
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-06-13
14:29:14 UTC (rev 17622)
@@ -72,7 +72,9 @@
var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0;
var width = Math.max(0, element.clientWidth - offsetWidth);
if (width) {
- normalPartStyle.width = width + "px";
+ if (parts.width() > width) {
+ normalPartStyle.width = width + "px";
+ }
normalPartStyle.display = "block";
if (scrollElement.clientWidth < scrollElement.scrollWidth
&& scrollElement.scrollHeight == scrollElement.offsetHeight) {
@@ -95,7 +97,9 @@
}
el = el.nextSibling;
}
- bodyElement.style.height = height + "px";
+ if (bodyElement.offsetHeight > height) {
+ bodyElement.style.height = height + "px";
+ }
};
var adjustResizers = function() {
@@ -151,7 +155,9 @@
dataTableElement = contentElement.lastChild;//TODO this.dataTableElement =
Richfaces.lastDescendant(this.contentElement);
rows = document.getElementById(id + ":body").firstChild.rows.length;//TODO
Richfaces.firstDescendant;
rowHeight = dataTableElement.offsetHeight / rows;
- contentElement.style.height = (rowCount * rowHeight) + "px";
+ if (rowCount != rows) {
+ contentElement.style.height = (rowCount * rowHeight) + "px";
+ }
jQuery(bodyElement).bind("scroll", bodyScrollListener);
} else {
spacerElement = null;
Show replies by date