Browse Source

Fix #35: data formatter display error.

zhixin 11 years ago
parent
commit
057ca3c92e
2 changed files with 9 additions and 2 deletions
  1. 6 0
      CHANGELOG.md
  2. 3 2
      src/bootstrap-table.js

+ 6 - 0
CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 1.0.7
+
+* Fix old firefox browser display error.
+* Add minimunCountColumns option.
+
+
 ### 1.0.6
 
 * Add jQuery events.

+ 3 - 2
src/bootstrap-table.js

@@ -201,7 +201,7 @@
 
             columns.push(column);
         });
-        this.options.columns = $.extend(true, columns, this.options.columns);
+        this.options.columns = $.extend({}, columns, this.options.columns);
         $.each(this.options.columns, function(i, column) {
             that.options.columns[i] = $.extend({}, BootstrapTable.COLUMN_DEFAULTS, column);
         });
@@ -381,7 +381,8 @@
 
             $keepOpen = this.$toolbar.find('.keep-open li');
             $keepOpen.off('click').on('click', function(event) {
-                event.stopPropagation();
+                event.stopImmediatePropagation();
+
                 var $this = $(this).find('input'),
                     $items = $keepOpen.find('input').prop('disabled', false);