Browse Source

Fix IE browser header height error bug.

zhixin 10 years ago
parent
commit
d0abc237bd
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/bootstrap-table.js

+ 2 - 2
src/bootstrap-table.js

@@ -1681,10 +1681,10 @@
         fixedBody = this.$tableBody.get(0);
         fixedBody = this.$tableBody.get(0);
 
 
         scrollWidth = fixedBody.scrollWidth > fixedBody.clientWidth &&
         scrollWidth = fixedBody.scrollWidth > fixedBody.clientWidth &&
-            fixedBody.scrollHeight > fixedBody.clientHeight + this.$header.height() ?
+            fixedBody.scrollHeight > fixedBody.clientHeight + this.$header.outerHeight() ?
             getScrollBarWidth() : 0;
             getScrollBarWidth() : 0;
 
 
-        this.$el.css('margin-top', -this.$header.height());
+        this.$el.css('margin-top', -this.$header.outerHeight());
         this.$header_ = this.$header.clone(true, true);
         this.$header_ = this.$header.clone(true, true);
         this.$selectAll_ = this.$header_.find('[name="btSelectAll"]');
         this.$selectAll_ = this.$header_.find('[name="btSelectAll"]');
         this.$tableHeader.css({
         this.$tableHeader.css({