summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkzhdev <kzhdev@gmail.com>2013-06-14 12:24:21 -0500
committerkzhdev <kzhdev@gmail.com>2013-06-14 12:24:21 -0500
commit710d63ae0304864a27b842db37a2e6923054cff9 (patch)
tree8ad71306f36547df42bb9b782098acd87521567f
parent1e82fec3ce99afff3b075b6521942476a962afd0 (diff)
parent30d4c4aee243ec97dcf1b0fa9a03d704704a93ed (diff)
downloadSlickGrid-710d63ae0304864a27b842db37a2e6923054cff9.zip
SlickGrid-710d63ae0304864a27b842db37a2e6923054cff9.tar.gz
SlickGrid-710d63ae0304864a27b842db37a2e6923054cff9.tar.bz2
Merge remote-tracking branch 'upstream/master'
-rw-r--r--slick.grid.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/slick.grid.js b/slick.grid.js
index 9d70670..dd1ab32 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -547,9 +547,10 @@ if (typeof Slick === "undefined") {
for (var i = 0; i < columns.length; i++) {
var m = columns[i];
- var header = $("<div class='ui-state-default slick-header-column' id='" + uid + m.id + "' />")
+ var header = $("<div class='ui-state-default slick-header-column' />")
.html("<span class='slick-column-name'>" + m.name + "</span>")
.width(m.width - headerColumnWidthDiff)
+ .attr("id", "" + uid + m.id)
.attr("title", m.toolTip || "")
.data("column", m)
.addClass(m.headerCssClass || "")