浏览代码

Fix for headers where data is split to html and js

Tables with headers defined in markup (<th>Label<th>) and extra data (like visiblity) in JS would get existing Labels overwritten unless deep-extend is performed.
Tomislav Simić 11 年之前
父节点
当前提交
957bb7fd76
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/bootstrap-table.js

+ 1 - 1
src/bootstrap-table.js

@@ -200,7 +200,7 @@
 
             columns.push(column);
         });
-        this.options.columns = $.extend(columns, this.options.columns);
+        this.options.columns = $.extend(true, columns, this.options.columns);
         $.each(this.options.columns, function(i, column) {
             that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, column);
         });