[richfaces-svn-commits] JBoss Rich Faces SVN: r23278 - branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
Author: ivassile
Date: 2014-01-13 14:45:07 -0500 (Mon, 13 Jan 2014)
New Revision: 23278
Modified:
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
Log:
Extended data table fixes from BZ-982322: RF-10793, RF-8148 and RF-7173
Modified:
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
---
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2013-12-10
03:38:28 UTC (rev 23277)
+++
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2014-01-13
19:45:07 UTC (rev 23278)
@@ -398,8 +398,11 @@
cols[columnsNumber-1].width = null;
cols[cols.length-1].width = null;
var newHeight = mainDivHeight - header.getHeight() - footerHeight - 2;
- newHeight -= this.header.getCaptionHeight();
- scrollingDiv.setStyle('height:'+ newHeight +'px;');
+ var caption = header.getCaption()
+ if (caption && caption.tagName == "caption") {
+ newHeight -= this.header.getCaptionHeight();
+ }
+ scrollingDiv.setStyle('height:'+ newHeight +'px;');
this._redrawTable(table);
header.adjustSeparators();
this._redrawTable(this.tableB);
Modified:
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
===================================================================
---
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2013-12-10
03:38:28 UTC (rev 23277)
+++
branches/enterprise/3.3.1.SP4/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2014-01-13
19:45:07 UTC (rev 23278)
@@ -492,7 +492,7 @@
}
break;
case 65: case 97: // Ctrl-A
- if (this.inFocus && event.ctrlKey && !event.altKey) {
+ if (this.inFocus && event.ctrlKey && !event.altKey &&
this.options.selectionMode == "multi") { //RF-8148
this.selectionFlag = "a";
for (var i = 0; i < this.rowCount; i++) {
this.addRowToSelection(i);
@@ -555,6 +555,7 @@
range = [this.startRow, this.endRow];
this.setSelection(range);
} else if (!event.shiftKey && event.ctrlKey && !event.altKey) {
+ this.selectionFlag = "x"; //RF-10793
if (this.selection.isSelectedId(rowIndex)) {
this.removeRowFromSelection(rowIndex);
} else {