Browse Source

Fix #102: Wrong options.columns initialization.

zhixin 11 years ago
parent
commit
cec32d4e07
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/bootstrap-table.js

+ 1 - 1
src/bootstrap-table.js

@@ -269,7 +269,7 @@
 
 
             columns.push(column);
             columns.push(column);
         });
         });
-        this.options.columns = $.extend({}, columns, this.options.columns);
+        this.options.columns = $.extend([], columns, this.options.columns);
         $.each(this.options.columns, function (i, column) {
         $.each(this.options.columns, function (i, column) {
             that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS,
             that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS,
                 {field: i}, column); // when field is undefined, use index instead
                 {field: i}, column); // when field is undefined, use index instead