#59 - support tables with existing colgroups

mkoryak · Apr 11, 2014 · 13d2037 · 13d2037
1 parent 1d14a00
commit 13d2037
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-jquery.floatThead v1.2.5
+jquery.floatThead v1.2.6
 =================
 
 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. 
@@ -22,7 +22,7 @@ Download / Install:
 
 #### Download
 
-[Latest Release](https://github.com/mkoryak/floatThead/archive/v1.2.5.zip)
+[Latest Release](https://github.com/mkoryak/floatThead/archive/v1.2.6.zip)
 
 Inside of that zip the following javascript files are of interest to you:
 
@@ -67,6 +67,7 @@ Features:
 Requirements:
 -------------
 
+
 -   jQuery 1.8.x or better (1.9 compliant) (or jQuery 1.7.x and jQuery UI core)
 -   IE8, IE9, IE10, IE11, FF10+ or Chrome15+.
 -   The following meta tag to placate IE: <code>&lt;meta http-equiv="X-UA-Compatible" content="IE=10; IE=9; IE=8; IE=7; IE=EDGE" /&gt;</code>
@@ -88,6 +89,19 @@ Watch for it.
 
 Change Log
 ----------
+
+### 1.2.6
+- new stuff:
+- added support for tables with existing `<colgroup>` elements
+- added a grunt task to build dist to master
+
+- bug fixes:
+- https://github.com/mkoryak/floatThead/issues/57 - window resize issues on windows
+- https://github.com/mkoryak/floatThead/issues/70 - better support for responsive tables
+- https://github.com/mkoryak/floatThead/issues/71 - incorrectly unbinding events in destroy
+- https://github.com/mkoryak/floatThead/issues/75 - dom leakage in destroy
+
+
 ### 1.2.5
 - bug fixes:
 - https://github.com/mkoryak/floatThead/issues/66

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery.floatThead",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "homepage": "http://mkoryak.github.io/floatThead/",
   "authors": [
     "Misha Koryak"

diff --git a/dist/jquery.floatThead-slim.js b/dist/jquery.floatThead-slim.js
@@ -1,4 +1,4 @@
-// @preserve jQuery.floatThead 1.2.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.6 - 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
@@ -201,7 +201,12 @@
       var absoluteToFixedOnScroll = ieVersion <= 9 && !locked && useAbsolutePositioning; //on ie using absolute positioning doesnt look good with window scrolling, so we change positon to fixed on scroll, and then change it back to absolute when done.
       var $floatTable = $("<table/>");
       var $floatColGroup = $("<colgroup/>");
-      var $tableColGroup = $("<colgroup/>");
+      var $tableColGroup = $table.find('colgroup:first');
+      var existingColGroup = true;
+      if($tableColGroup.length == 0){
+        $tableColGroup = $("<colgroup/>");
+        existingColGroup = false;
+      }
       var $fthRow = $('<fthrow style="display:table-row;height:0;"/>'); //created unstyled elements
       var $floatContainer = $('<div style="overflow: hidden;"></div>');
       var $newHeader = $("<thead/>");
@@ -303,11 +308,16 @@
        * get the number of columns and also rebuild resizer rows if the count is different then the last count
        */
       function columnNum(){
-        var $headerColumns = $header.find('tr:first>'+opts.cellTag);
-        var count = 0;
-        $headerColumns.each(function(){
-          count += parseInt(($(this).attr('colspan') || 1), 10);
-        });
+        var count, $headerColumns;
+        if(existingColGroup){
+          count = $tableColGroup.find('col').length;
+        } else {
+          $headerColumns = $header.find('tr:first>'+opts.cellTag);
+          count = 0;
+          $headerColumns.each(function(){
+            count += parseInt(($(this).attr('colspan') || 1), 10);
+          });
+        }
         if(count != lastColumnCount){
           lastColumnCount = count;
           var cells = [], cols = [], psuedo = [];
@@ -328,7 +338,9 @@
 
           $sizerRow.html(cells);
           $sizerCells = $sizerRow.find("th");
-          $tableColGroup.html(cols);
+          if(!existingColGroup){
+            $tableColGroup.html(cols);
+          }
           $tableCells = $tableColGroup.find('col');
           $floatColGroup.html(cols);
           $headerCells = $floatColGroup.find("col");
@@ -394,8 +406,10 @@
         return function(){
           var $rowCells = getSizingRow($table, $tableCells, $fthCells, ieVersion);
           if($rowCells.length == numCols && numCols > 0){
-            for(i=0; i < numCols; i++){
-              $tableCells.eq(i).css('width', '');
+            if(!existingColGroup){
+              for(i=0; i < numCols; i++){
+                $tableCells.eq(i).css('width', '');
+              }
             }
             unfloat();
             for(i=0; i < numCols; i++){

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.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.6 - 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
@@ -201,7 +201,12 @@
       var absoluteToFixedOnScroll = ieVersion <= 9 && !locked && useAbsolutePositioning; //on ie using absolute positioning doesnt look good with window scrolling, so we change positon to fixed on scroll, and then change it back to absolute when done.
       var $floatTable = $("<table/>");
       var $floatColGroup = $("<colgroup/>");
-      var $tableColGroup = $("<colgroup/>");
+      var $tableColGroup = $table.find('colgroup:first');
+      var existingColGroup = true;
+      if($tableColGroup.length == 0){
+        $tableColGroup = $("<colgroup/>");
+        existingColGroup = false;
+      }
       var $fthRow = $('<fthrow style="display:table-row;height:0;"/>'); //created unstyled elements
       var $floatContainer = $('<div style="overflow: hidden;"></div>');
       var $newHeader = $("<thead/>");
@@ -303,11 +308,16 @@
        * get the number of columns and also rebuild resizer rows if the count is different then the last count
        */
       function columnNum(){
-        var $headerColumns = $header.find('tr:first>'+opts.cellTag);
-        var count = 0;
-        $headerColumns.each(function(){
-          count += parseInt(($(this).attr('colspan') || 1), 10);
-        });
+        var count, $headerColumns;
+        if(existingColGroup){
+          count = $tableColGroup.find('col').length;
+        } else {
+          $headerColumns = $header.find('tr:first>'+opts.cellTag);
+          count = 0;
+          $headerColumns.each(function(){
+            count += parseInt(($(this).attr('colspan') || 1), 10);
+          });
+        }
         if(count != lastColumnCount){
           lastColumnCount = count;
           var cells = [], cols = [], psuedo = [];
@@ -328,7 +338,9 @@
 
           $sizerRow.html(cells);
           $sizerCells = $sizerRow.find("th");
-          $tableColGroup.html(cols);
+          if(!existingColGroup){
+            $tableColGroup.html(cols);
+          }
           $tableCells = $tableColGroup.find('col');
           $floatColGroup.html(cols);
           $headerCells = $floatColGroup.find("col");
@@ -394,8 +406,10 @@
         return function(){
           var $rowCells = getSizingRow($table, $tableCells, $fthCells, ieVersion);
           if($rowCells.length == numCols && numCols > 0){
-            for(i=0; i < numCols; i++){
-              $tableCells.eq(i).css('width', '');
+            if(!existingColGroup){
+              for(i=0; i < numCols; i++){
+                $tableCells.eq(i).css('width', '');
+              }
             }
             unfloat();
             for(i=0; i < numCols; i++){

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.5 - http://mkoryak.github.io/floatThead/ - Copyright (c) 2012 - 2014 Misha Koryak
+// @preserve jQuery.floatThead 1.2.6 - 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
@@ -201,7 +201,12 @@
       var absoluteToFixedOnScroll = ieVersion <= 9 && !locked && useAbsolutePositioning; //on ie using absolute positioning doesnt look good with window scrolling, so we change positon to fixed on scroll, and then change it back to absolute when done.
       var $floatTable = $("<table/>");
       var $floatColGroup = $("<colgroup/>");
-      var $tableColGroup = $("<colgroup/>");
+      var $tableColGroup = $table.find('colgroup:first');
+      var existingColGroup = true;
+      if($tableColGroup.length == 0){
+        $tableColGroup = $("<colgroup/>");
+        existingColGroup = false;
+      }
       var $fthRow = $('<fthrow style="display:table-row;height:0;"/>'); //created unstyled elements
       var $floatContainer = $('<div style="overflow: hidden;"></div>');
       var $newHeader = $("<thead/>");
@@ -303,11 +308,16 @@
        * get the number of columns and also rebuild resizer rows if the count is different then the last count
        */
       function columnNum(){
-        var $headerColumns = $header.find('tr:first>'+opts.cellTag);
-        var count = 0;
-        $headerColumns.each(function(){
-          count += parseInt(($(this).attr('colspan') || 1), 10);
-        });
+        var count, $headerColumns;
+        if(existingColGroup){
+          count = $tableColGroup.find('col').length;
+        } else {
+          $headerColumns = $header.find('tr:first>'+opts.cellTag);
+          count = 0;
+          $headerColumns.each(function(){
+            count += parseInt(($(this).attr('colspan') || 1), 10);
+          });
+        }
         if(count != lastColumnCount){
           lastColumnCount = count;
           var cells = [], cols = [], psuedo = [];
@@ -328,7 +338,9 @@
 
           $sizerRow.html(cells);
           $sizerCells = $sizerRow.find("th");
-          $tableColGroup.html(cols);
+          if(!existingColGroup){
+            $tableColGroup.html(cols);
+          }
           $tableCells = $tableColGroup.find('col');
           $floatColGroup.html(cols);
           $headerCells = $floatColGroup.find("col");
@@ -394,8 +406,10 @@
         return function(){
           var $rowCells = getSizingRow($table, $tableCells, $fthCells, ieVersion);
           if($rowCells.length == numCols && numCols > 0){
-            for(i=0; i < numCols; i++){
-              $tableCells.eq(i).css('width', '');
+            if(!existingColGroup){
+              for(i=0; i < numCols; i++){
+                $tableCells.eq(i).css('width', '');
+              }
             }
             unfloat();
             for(i=0; i < numCols; i++){

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