Author: pkawiak
Date: 2008-07-28 04:53:47 -0400 (Mon, 28 Jul 2008)
New Revision: 9797
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
Log:
Hiding borders in ie6
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-28
07:26:32 UTC (rev 9796)
+++
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-07-28
08:53:47 UTC (rev 9797)
@@ -193,10 +193,10 @@
if (bValue) {
sVisibility = '';
- sBorderColor = '';
+ sBorderStyle = '';
}else{
sVisibility = 'none';
- sBorderColor = 'transparent';
+ sBorderStyle = 'none';
}
var size = group.size();
for (var i=0; i<size; i++) {
@@ -206,7 +206,7 @@
//which parents have been hidden :|
var cells = group[i].childNodes;
for (var j=0; j<cells.length; j++) {
- cells[j].style.borderColor = sBorderColor;
+ cells[j].style.borderStyle = sBorderStyle;
}
}
}
@@ -258,7 +258,11 @@
var i=1;
var endIndex = columns.length-1;
while ((i < endIndex) && (excessWidth > 0)) {
- var colWidth = this.getColumnWidth(i);
+ if (ClientUILib.isIE) {
+ var colWidth = parseInt(this.getColumns()[i].width) - 1;
+ }else{
+ var colWidth = this.getColumnWidth(i);
+ }
var spareWidth = colWidth - this.minColumnWidth;
var dW;
if (spareWidth >= excessWidth) {
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2008-07-28
07:26:32 UTC (rev 9796)
+++
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2008-07-28
08:53:47 UTC (rev 9797)
@@ -286,13 +286,12 @@
} else { //extended listener binding with grouping
var groupRow;
var lastGroupId = 0;
- var bGroupExpanded;
- if (!ClientUILib.isIE) {
- //make first fake row visible to ensure proper rendering
- bGroupExpanded = true;
- }else{
- bGroupExpanded = false;
- }
+ var bGroupExpanded = true;
+ var bHideFirstRow = false;
+ if (ClientUILib.isIE) {
+ //hide first fake ie row to ensure proper rendering
+ bHideFirstRow = true;
+ };
var groupId;
var groupItems = [];
var groupItem = 0;
@@ -322,14 +321,17 @@
this.addListener(nrows[i], rowIndex);
}
groupItems[groupItem++] = nrows[i];
+ if ( (i==0) && (bHideFirstRow) ) {
+
+ }
if (!bGroupExpanded) {
nrows[i].style.display = 'none';
- if (ClientUILib.isIE){
+ if ((ClientUILib.isIE) && (i!=0)){
//prevent IE from showing borders of cells
//which parents have been hidden :|
var cells = nrows[i].childNodes;
for (var j=0; j<cells.length; j++) {
- cells[j].style.borderColor = 'transparent';
+ cells[j].style.borderStyle = 'none';
}
}
}
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss
===================================================================
---
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-28
07:26:32 UTC (rev 9796)
+++
trunk/sandbox/ui/extendedDataTable/src/main/resources/org/richfaces/renderkit/html/css/extendedDataTable.xcss 2008-07-28
08:53:47 UTC (rev 9797)
@@ -71,6 +71,10 @@
position: absolute;
width: 20px;
}
+
+ .extdt-fakeierow {
+
+ }
.extdt-menu-div-on {
height: 23px;
Show replies by date