Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions slick.grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ No built-in (selected, editable, highlight, flashing, invalid, loading, :focus)
classes should alter those!
*/

.slick-header.ui-state-default, .slick-headerrow.ui-state-default {
.slick-header.ui-state-default, .slick-headerrow.ui-state-default, .slick-footerrow.ui-state-default {
width: 100%;
overflow: hidden;
border-left: 0px;
}

.slick-header-columns, .slick-headerrow-columns {
.slick-header-columns, .slick-headerrow-columns, .slick-footerrow-columns {
position: relative;
white-space: nowrap;
cursor: default;
Expand All @@ -35,7 +35,7 @@ classes should alter those!
float: left;
}

.slick-headerrow-column.ui-state-default {
.slick-headerrow-column.ui-state-default, .slick-footerrow-column.ui-state-default {
padding: 4px;
}

Expand Down Expand Up @@ -86,11 +86,10 @@ classes should alter those!
width: 100%;
}

.slick-cell, .slick-headerrow-column {
.slick-cell, .slick-headerrow-column, .slick-footerrow-column {
position: absolute;
border: 1px solid transparent;
border-right: 1px dotted silver;
border-bottom-color: silver;
overflow: hidden;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
Expand All @@ -101,6 +100,12 @@ classes should alter those!
white-space: nowrap;
cursor: default;
}
.slick-cell, .slick-headerrow-column{
border-bottom-color: silver;
}
.slick-footerrow-column {
border-top-color: silver;
}

.slick-group {
}
Expand Down
75 changes: 73 additions & 2 deletions slick.grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ if (typeof Slick === "undefined") {
editorLock: Slick.GlobalEditorLock,
showHeaderRow: false,
headerRowHeight: 25,
showFooterRow: false,
footerRowHeight: 25,
showTopPanel: false,
topPanelHeight: 25,
formatterFactory: null,
Expand Down Expand Up @@ -121,6 +123,7 @@ if (typeof Slick === "undefined") {
var $headerScroller;
var $headers;
var $headerRow, $headerRowScroller, $headerRowSpacer;
var $footerRow, $footerRowScroller, $footerRowSpacer;
var $topPanelScroller;
var $topPanel;
var $viewport;
Expand Down Expand Up @@ -262,6 +265,16 @@ if (typeof Slick === "undefined") {

$canvas = $("<div class='grid-canvas' />").appendTo($viewport);

$footerRowScroller = $("<div class='slick-footerrow ui-state-default' style='overflow:hidden;position:relative;' />").appendTo($container);
$footerRow = $("<div class='slick-footerrow-columns' />").appendTo($footerRowScroller);
$footerRowSpacer = $("<div style='display:block;height:1px;position:absolute;top:0;left:0;'></div>")
.css("width", getCanvasWidth() + scrollbarDimensions.width + "px")
.appendTo($footerRowScroller);

if (!options.showFooterRow) {
$footerRowScroller.hide();
}

$focusSink2 = $focusSink.clone().appendTo($container);

if (!options.explicitInitialization) {
Expand Down Expand Up @@ -313,6 +326,8 @@ if (typeof Slick === "undefined") {
.delegate(".slick-header-column", "mouseleave", handleHeaderMouseLeave);
$headerRowScroller
.bind("scroll", handleHeaderRowScroll);
$footerRowScroller
.bind("scroll", handleFooterRowScroll);
$focusSink.add($focusSink2)
.bind("keydown", handleKeyDown);
$canvas
Expand Down Expand Up @@ -412,11 +427,14 @@ if (typeof Slick === "undefined") {
if (canvasWidth != oldCanvasWidth) {
$canvas.width(canvasWidth);
$headerRow.width(canvasWidth);
$footerRow.width(canvasWidth);
$headers.width(getHeadersWidth());
viewportHasHScroll = (canvasWidth > viewportW - scrollbarDimensions.width);
}

$headerRowSpacer.width(canvasWidth + (viewportHasVScroll ? scrollbarDimensions.width : 0));
var w=canvasWidth + (viewportHasVScroll ? scrollbarDimensions.width : 0);
$headerRowSpacer.width(w);
$footerRowSpacer.width(w);

if (canvasWidth != oldCanvasWidth || forceColumnWidthsUpdate) {
applyColumnWidths();
Expand Down Expand Up @@ -515,12 +533,20 @@ if (typeof Slick === "undefined") {
function getHeaderRow() {
return $headerRow[0];
}
function getFooterRow() {
return $footerRow[0];
}

function getHeaderRowColumn(columnId) {
var idx = getColumnIndex(columnId);
var $header = $headerRow.children().eq(idx);
return $header && $header[0];
}
function getFooterRowColumn(columnId) {
var idx = getColumnIndex(columnId);
var $footer = $footerRow.children().eq(idx);
return $footer && $footer[0];
}

function createColumnHeaders() {
function onMouseEnter() {
Expand Down Expand Up @@ -555,6 +581,17 @@ if (typeof Slick === "undefined") {
}
});
$headerRow.empty();
$footerRow.find(".slick-footerrow-column")
.each(function() {
var columnDef = $(this).data("column");
if (columnDef) {
trigger(self.onBeforeFooterRowCellDestroy, {
"node": this,
"column": columnDef
});
}
});
$footerRow.empty();

for (var i = 0; i < columns.length; i++) {
var m = columns[i];
Expand Down Expand Up @@ -594,6 +631,16 @@ if (typeof Slick === "undefined") {
"column": m
});
}
if (options.showFooterRow) {
var footerRowCell = $("<div class='ui-state-default slick-footerrow-column l" + i + " r" + i + "'></div>")
.data("column", m)
.appendTo($footerRow);

trigger(self.onFooterRowCellRendered, {
"node": footerRowCell[0],
"column": m
});
}
}

setSortColumns(sortColumns);
Expand Down Expand Up @@ -924,6 +971,7 @@ if (typeof Slick === "undefined") {
"." + uid + " .slick-header-column { left: 1000px; }",
"." + uid + " .slick-top-panel { height:" + options.topPanelHeight + "px; }",
"." + uid + " .slick-headerrow-columns { height:" + options.headerRowHeight + "px; }",
"." + uid + " .slick-footerrow-columns { height:" + options.footerRowHeight + "px; }",
"." + uid + " .slick-cell { height:" + rowHeight + "px; }",
"." + uid + " .slick-row { height:" + options.rowHeight + "px; }"
];
Expand Down Expand Up @@ -1315,6 +1363,16 @@ if (typeof Slick === "undefined") {
}
}
}
function setFooterRowVisibility(visible) {
if (options.showFooterRow != visible) {
options.showFooterRow = visible;
if (visible) {
$footerRowScroller.slideDown("fast", resizeCanvas);
} else {
$footerRowScroller.slideUp("fast", resizeCanvas);
}
}
}

function getContainerNode() {
return $container.get(0);
Expand Down Expand Up @@ -1594,7 +1652,8 @@ if (typeof Slick === "undefined") {
parseFloat($.css($container[0], "paddingBottom", true)) -
parseFloat($.css($headerScroller[0], "height")) - getVBoxDelta($headerScroller) -
(options.showTopPanel ? options.topPanelHeight + getVBoxDelta($topPanelScroller) : 0) -
(options.showHeaderRow ? options.headerRowHeight + getVBoxDelta($headerRowScroller) : 0);
(options.showHeaderRow ? options.headerRowHeight + getVBoxDelta($headerRowScroller) : 0) -
(options.showFooterRow ? options.footerRowHeight + getVBoxDelta($footerRowScroller) : 0);
}

function resizeCanvas() {
Expand Down Expand Up @@ -1972,6 +2031,12 @@ if (typeof Slick === "undefined") {
$viewport[0].scrollLeft = scrollLeft;
}
}
function handleFooterRowScroll() {
var scrollLeft = $footerRowScroller[0].scrollLeft;
if (scrollLeft != $viewport[0].scrollLeft) {
$viewport[0].scrollLeft = scrollLeft;
}
}

function handleScroll() {
scrollTop = $viewport[0].scrollTop;
Expand All @@ -1984,6 +2049,7 @@ if (typeof Slick === "undefined") {
$headerScroller[0].scrollLeft = scrollLeft;
$topPanelScroller[0].scrollLeft = scrollLeft;
$headerRowScroller[0].scrollLeft = scrollLeft;
$footerRowScroller[0].scrollLeft = scrollLeft;
}

if (vScrollDist) {
Expand Down Expand Up @@ -3310,7 +3376,9 @@ if (typeof Slick === "undefined") {
"onHeaderCellRendered": new Slick.Event(),
"onBeforeHeaderCellDestroy": new Slick.Event(),
"onHeaderRowCellRendered": new Slick.Event(),
"onFooterRowCellRendered": new Slick.Event(),
"onBeforeHeaderRowCellDestroy": new Slick.Event(),
"onBeforeFooterRowCellDestroy": new Slick.Event(),
"onMouseEnter": new Slick.Event(),
"onMouseLeave": new Slick.Event(),
"onClick": new Slick.Event(),
Expand Down Expand Up @@ -3402,6 +3470,9 @@ if (typeof Slick === "undefined") {
"setHeaderRowVisibility": setHeaderRowVisibility,
"getHeaderRow": getHeaderRow,
"getHeaderRowColumn": getHeaderRowColumn,
"setFooterRowVisibility": setFooterRowVisibility,
"getFooterRow": getFooterRow,
"getFooterRowColumn": getFooterRowColumn,
"getGridPosition": getGridPosition,
"flashCell": flashCell,
"addCellCssStyles": addCellCssStyles,
Expand Down