Merge pull request #67 from mkoryak/bug-fixes

bug fixes
mkoryak · Mar 24, 2014 · 259ffec · 259ffec
2 parents 17d164a + 6d3bcd1
commit 259ffec
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-jquery.floatThead v1.2.4
+jquery.floatThead v1.2.5
 =================
 
 Float the table header without special css. This plugin assumes nothing about your table markup and "just works" without losing your events or styles. Supports floating the header while scrolling within the window or while scrolling within a container with overflow. 
@@ -84,6 +84,11 @@ Watch for it.
 
 Change Log
 ----------
+### 1.2.5
+- bug fixes:
+- https://github.com/mkoryak/floatThead/issues/66
+- https://github.com/mkoryak/floatThead/issues/65
+- https://github.com/mkoryak/floatThead/issues/62
 
 ### 1.2.4
 - better support for really really wide tables

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery.floatThead",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "homepage": "http://mkoryak.github.io/floatThead/",
   "authors": [
     "Misha Koryak"
@@ -16,8 +16,7 @@
     "node_modules",
     "bower_components",
     "test",
-    "demo",
-    "USED_BY.md"
+    "demo"
   ],
   "dependencies": {
     "jquery": ">= 1.9.0"

diff --git a/dist/jquery.floatThead-slim.js b/dist/jquery.floatThead-slim.js
@@ -1,4 +1,4 @@
-// @preserve jQuery.floatThead 1.2.4 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
 // @license Licensed under http://creativecommons.org/licenses/by-sa/4.0/
 
 /* @author Misha Koryak
@@ -66,7 +66,19 @@
    */
 
   function windowResize(debounceMs, cb){
-    $window.bind('resize.floatTHead', util.debounce(cb, debounceMs)); //TODO: check if resize bug is gone in IE8 +
+    if(ieVersion == 8){ //ie8 is crap: https://github.com/mkoryak/floatThead/issues/65
+      var winWidth = $window.width();
+      var debouncedCb = util.debounce(function(){
+        var winWidthNew = $window.width();
+        if(winWidth != winWidthNew){
+          winWidth = winWidthNew;
+          cb();
+        }
+      }, debounceMs);
+      $window.bind('resize.floatTHead', debouncedCb);
+    } else {
+      $window.bind('resize.floatTHead', util.debounce(cb, debounceMs));
+    }
   }
 
 
@@ -144,7 +156,7 @@
     }
     var opts = $.extend({}, $.floatThead.defaults || {}, map);
 
-    $.each(map, function(val, key){
+    $.each(map, function(key, val){
       if((!(key in $.floatThead.defaults)) && opts.debug){
         debug("jQuery.floatThead: used ["+key+"] key to init plugin, but that param is not an option for the plugin. Valid options are: "+ (util.keys($.floatThead.defaults)).join(', '));
       }
@@ -256,7 +268,10 @@
       var originalTableWidth = $table[0].style.width || "auto";
 
       function setHeaderHeight(){
-        var headerHeight = $header.find(opts.cellTag).outerHeight(true);
+        var headerHeight = 0;
+        $header.find("tr").each(function(){
+          headerHeight += $(this).outerHeight(true);
+        });
         $sizerRow.outerHeight(headerHeight);
         $sizerCells.outerHeight(headerHeight);
       }

diff --git a/dist/jquery.floatThead-slim.min.js b/dist/jquery.floatThead-slim.min.js
diff --git a/dist/jquery.floatThead.js b/dist/jquery.floatThead.js
@@ -1,4 +1,4 @@
-// @preserve jQuery.floatThead 1.2.4 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
 // @license Licensed under http://creativecommons.org/licenses/by-sa/4.0/
 
 /* @author Misha Koryak
@@ -66,7 +66,19 @@
    */
 
   function windowResize(debounceMs, cb){
-    $window.bind('resize.floatTHead', util.debounce(cb, debounceMs)); //TODO: check if resize bug is gone in IE8 +
+    if(ieVersion == 8){ //ie8 is crap: https://github.com/mkoryak/floatThead/issues/65
+      var winWidth = $window.width();
+      var debouncedCb = util.debounce(function(){
+        var winWidthNew = $window.width();
+        if(winWidth != winWidthNew){
+          winWidth = winWidthNew;
+          cb();
+        }
+      }, debounceMs);
+      $window.bind('resize.floatTHead', debouncedCb);
+    } else {
+      $window.bind('resize.floatTHead', util.debounce(cb, debounceMs));
+    }
   }
 
 
@@ -144,7 +156,7 @@
     }
     var opts = $.extend({}, $.floatThead.defaults || {}, map);
 
-    $.each(map, function(val, key){
+    $.each(map, function(key, val){
       if((!(key in $.floatThead.defaults)) && opts.debug){
         debug("jQuery.floatThead: used ["+key+"] key to init plugin, but that param is not an option for the plugin. Valid options are: "+ (util.keys($.floatThead.defaults)).join(', '));
       }
@@ -256,7 +268,10 @@
       var originalTableWidth = $table[0].style.width || "auto";
 
       function setHeaderHeight(){
-        var headerHeight = $header.find(opts.cellTag).outerHeight(true);
+        var headerHeight = 0;
+        $header.find("tr").each(function(){
+          headerHeight += $(this).outerHeight(true);
+        });
         $sizerRow.outerHeight(headerHeight);
         $sizerCells.outerHeight(headerHeight);
       }

diff --git a/dist/jquery.floatThead.min.js b/dist/jquery.floatThead.min.js
diff --git a/jquery.floatThead.js b/jquery.floatThead.js
@@ -1,4 +1,4 @@
-// @preserve jQuery.floatThead 1.2.4 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
 // @license Licensed under http://creativecommons.org/licenses/by-sa/4.0/
 
 /* @author Misha Koryak
@@ -66,7 +66,19 @@
    */
 
   function windowResize(debounceMs, cb){
-    $window.bind('resize.floatTHead', util.debounce(cb, debounceMs)); //TODO: check if resize bug is gone in IE8 +
+    if(ieVersion == 8){ //ie8 is crap: https://github.com/mkoryak/floatThead/issues/65
+      var winWidth = $window.width();
+      var debouncedCb = util.debounce(function(){
+        var winWidthNew = $window.width();
+        if(winWidth != winWidthNew){
+          winWidth = winWidthNew;
+          cb();
+        }
+      }, debounceMs);
+      $window.bind('resize.floatTHead', debouncedCb);
+    } else {
+      $window.bind('resize.floatTHead', util.debounce(cb, debounceMs));
+    }
   }
 
 
@@ -144,7 +156,7 @@
     }
     var opts = $.extend({}, $.floatThead.defaults || {}, map);
 
-    $.each(map, function(val, key){
+    $.each(map, function(key, val){
       if((!(key in $.floatThead.defaults)) && opts.debug){
         debug("jQuery.floatThead: used ["+key+"] key to init plugin, but that param is not an option for the plugin. Valid options are: "+ (util.keys($.floatThead.defaults)).join(', '));
       }
@@ -256,7 +268,10 @@
       var originalTableWidth = $table[0].style.width || "auto";
 
       function setHeaderHeight(){
-        var headerHeight = $header.find(opts.cellTag).outerHeight(true);
+        var headerHeight = 0;
+        $header.find("tr").each(function(){
+          headerHeight += $(this).outerHeight(true);
+        });
         $sizerRow.outerHeight(headerHeight);
         $sizerCells.outerHeight(headerHeight);
       }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floatthead",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "locking table headers without special css",
   "filename": "jquery.floatThead.js",
   "dependencies": {},