diff options
| -rw-r--r-- | slick.grid.js | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/slick.grid.js b/slick.grid.js index 3035f53..c1397b3 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -272,9 +272,7 @@ if (typeof Slick === "undefined") { .bind("scroll.slickgrid", handleScroll); $headerScroller .bind("contextmenu.slickgrid", handleHeaderContextMenu) - .bind("click.slickgrid", handleHeaderClick) - .delegate(".slick-header-column", "mouseenter", handleHeaderMouseEnter) - .delegate(".slick-header-column", "mouseleave", handleHeaderMouseLeave); + .bind("click.slickgrid", handleHeaderClick); $focusSink .bind("keydown.slickgrid", handleKeyDown); $canvas @@ -462,7 +460,7 @@ if (typeof Slick === "undefined") { $headers.find(".slick-header-column") .each(function() { - var columnDef = $(this).data("column"); + var columnDef = columns[columnsById[$(this).data("fieldId")]]; if (columnDef) { trigger(self.onBeforeHeaderDestroy, { "headerNode": this, @@ -483,7 +481,7 @@ if (typeof Slick === "undefined") { .html("<span class='slick-column-name'>" + m.name + "</span>") .width(m.width - headerColumnWidthDiff) .attr("title", m.toolTip || "") - .data("column", m) + .data("fieldId", m.id) .addClass(m.headerCssClass || "") .appendTo($headers); @@ -533,7 +531,7 @@ if (typeof Slick === "undefined") { return; } - var column = $col.data("column"); + var column = columns[getColumnIndex($col.data("fieldId"))]; if (column.sortable) { if (!getEditorLock().commitCurrentEdit()) { return; @@ -1926,27 +1924,15 @@ if (typeof Slick === "undefined") { } } - function handleHeaderMouseEnter(e) { - trigger(self.onHeaderMouseEnter, { - "column": $(this).data("column") - }, e); - } - - function handleHeaderMouseLeave(e) { - trigger(self.onHeaderMouseLeave, { - "column": $(this).data("column") - }, e); - } - function handleHeaderContextMenu(e) { var $header = $(e.target).closest(".slick-header-column", ".slick-header-columns"); - var column = $header && $header.data("column"); + var column = $header && columns[self.getColumnIndex($header.data("fieldId"))]; trigger(self.onHeaderContextMenu, {column: column}, e); } function handleHeaderClick(e) { var $header = $(e.target).closest(".slick-header-column", ".slick-header-columns"); - var column = $header && $header.data("column"); + var column = $header && columns[self.getColumnIndex($header.data("fieldId"))]; if (column) { trigger(self.onHeaderClick, {column: column}, e); } @@ -2797,8 +2783,6 @@ if (typeof Slick === "undefined") { // Events "onScroll": new Slick.Event(), "onSort": new Slick.Event(), - "onHeaderMouseEnter": new Slick.Event(), - "onHeaderMouseLeave": new Slick.Event(), "onHeaderContextMenu": new Slick.Event(), "onHeaderClick": new Slick.Event(), "onHeaderRendered": new Slick.Event(), |