version bump

mkoryak · Jan 15, 2019 · ab47d73 · ab47d73
1 parent 21f515a
commit ab47d73
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+### 2.1.3
+Maintenance release. 
+
+bug fixes:
+- #409 - inf recursion printing on FireFox
+- #385 - bottom offset not respected in 'absolute' mode
+- #303 - scrollContainer with other content inside wrapper, header won't scroll out
+- #424 - table header fractional width set incorrectly. 
+
+### 2.1.2
+Maintenance release. 
+
+bug fixes:
+- #363 - scroll container assigned incorrect width because of a jquery 3.2.0 bug
+
+new features:
+- bad rtl support (only works with internal scrolling, not window scrolling)
+
 ### 2.1.1
 I goofed, forgot to build dist last release.
 
@@ -34,6 +52,7 @@ Breaking changes:
 - removed allowing deprecated options from 1.3.x
 - moved development version into /src dir and no longer use grunt here
 
+
 nothing big and exciting in version 2, just semvar and breaking changes.
 
 bug fixes:

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ npm install floatthead
 bower install floatThead
 ```
 #### Download code
-[Latest Release (zip)](https://github.com/mkoryak/floatThead/archive/2.1.2.zip)
+[Latest Release (zip)](https://github.com/mkoryak/floatThead/archive/2.1.3.zip)
 
 #### Via CDN
 [http://cdnjs.com/libraries/floatthead/](http://cdnjs.com/libraries/floatthead/)    

diff --git a/dist/jquery.floatThead.js b/dist/jquery.floatThead.js
@@ -141,11 +141,11 @@
     var _afterPrint = window.onafterprint;
     window.onbeforeprint = function () {
       _beforePrint && _beforePrint();
-      $window.triggerHandler("beforeprint");
+      $window.triggerHandler("fth-beforeprint");
     };
     window.onafterprint = function () {
       _afterPrint && _afterPrint();
-      $window.triggerHandler("afterprint");
+      $window.triggerHandler("fth-afterprint");
     };
   }
 
@@ -508,7 +508,7 @@
           var percent = 100 * tw / (floatContainerWidth);
           $floatTable.css('width', percent+'%');
         } else {
-          $floatTable.outerWidth(tw);
+          $floatTable.css('width', tw+'px');
         }
       }
 
@@ -780,6 +780,9 @@
               var gap = tableContainerGap - scrollingContainerTop + tableTopGap;
               top = gap > 0 ? gap : 0;
               triggerFloatEvent(false);
+            } else if(scrollingContainerTop - tableContainerGap > tableHeight - floatContainerHeight){
+              // scrolled past table but there is space in the container under it..
+              top = tableHeight - floatContainerHeight - scrollingContainerTop - tableContainerGap;
             } else {
               top = wrappedContainer ? tableTopGap : scrollingContainerTop;
               //headers stop at the top of the viewport
@@ -788,7 +791,7 @@
             left = tableLeftGap;
           } else if(!locked && useAbsolutePositioning) { //window scrolling, absolute positioning
             if(windowTop > floatEnd + tableHeight + captionScrollOffset){
-              top = tableHeight - floatContainerHeight + captionScrollOffset; //scrolled past table
+              top = tableHeight - floatContainerHeight + captionScrollOffset + scrollingBottom; //scrolled past table
             } else if (tableOffset.top >= windowTop + scrollingTop) {
               top = 0; //scrolling to table
               unfloat();
@@ -975,8 +978,8 @@
         matchMediaPrint = window.matchMedia("print");
         matchMediaPrint.addListener(printEvent);
       } else {
-        $window.on('beforeprint', beforePrint);
-        $window.on('afterprint', afterPrint);
+        $window.on('fth-beforeprint', beforePrint);
+        $window.on('fth-afterprint', afterPrint);
       }
       ////// end printing stuff
 
@@ -1073,6 +1076,7 @@
           $floatContainer.remove();
           $table.data('floatThead-attached', false);
           $window.off(ns);
+          $window.off('fth-beforeprint fth-afterprint'); // Not bound with id, so cant use ns.
           if (matchMediaPrint) {
             matchMediaPrint.removeListener(printEvent);
           }

diff --git a/dist/jquery.floatThead.min.js b/dist/jquery.floatThead.min.js
diff --git a/license.txt b/license.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2017 Misha Koryak
+Copyright (c) 2012-2018 Misha Koryak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floatthead",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "fixed table header plugin that works",
   "main": "dist/jquery.floatThead.min.js",
   "scripts": {
@@ -21,6 +21,7 @@
     "fixed table header",
     "table",
     "thead",
+    "the cat is cute",	
     "floatThead",
     "scrolling table",
     "jQuery plugin"