fix for #84

mkoryak · May 12, 2014 · 7b43acc · 7b43acc
1 parent 9830a8d
commit 7b43acc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -106,7 +106,7 @@ layout: lite\n\
 base_url: './../..'\n\
 slug: tests\n\
 bootstrap: false\n\
-desc: 'TODO description\n'\
+desc: 'TODO description'\n\
 issue: "+issue+"\n\
 ---\n\n";
       out += "<style>"+css+"</style>\n\n\n<script type='text/javascript'>"+js+"</script>\n\n\n\<div id='jsfiddle'>"+html+"</div>"

diff --git a/dist/jquery.floatThead-slim.js b/dist/jquery.floatThead-slim.js
@@ -578,8 +578,11 @@
        */
       function calculateScrollBarSize(){ //this should happen after the floating table has been positioned
         if($scrollContainer.length){
-          scrollbarOffset.horizontal = $scrollContainer.width() < $table.width() ? scWidth : 0;
-          scrollbarOffset.vertical =  $scrollContainer.height() < $table.height() ? scWidth: 0;
+          var sw = $scrollContainer.width(), sh = $scrollContainer.height(), th = $table.height(), tw = $table.width();
+          var offseth = sw < tw ? scWidth : 0;
+          var offsetv = sh < th ? scWidth : 0;
+          scrollbarOffset.horizontal = sw - offsetv < tw ? scWidth : 0;
+          scrollbarOffset.vertical =  sh - offseth < th ? scWidth: 0;
         }
       }
       //finish up. create all calculation functions and bind them to events

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
@@ -578,8 +578,11 @@
        */
       function calculateScrollBarSize(){ //this should happen after the floating table has been positioned
         if($scrollContainer.length){
-          scrollbarOffset.horizontal = $scrollContainer.width() < $table.width() ? scWidth : 0;
-          scrollbarOffset.vertical =  $scrollContainer.height() < $table.height() ? scWidth: 0;
+          var sw = $scrollContainer.width(), sh = $scrollContainer.height(), th = $table.height(), tw = $table.width();
+          var offseth = sw < tw ? scWidth : 0;
+          var offsetv = sh < th ? scWidth : 0;
+          scrollbarOffset.horizontal = sw - offsetv < tw ? scWidth : 0;
+          scrollbarOffset.vertical =  sh - offseth < th ? scWidth: 0;
         }
       }
       //finish up. create all calculation functions and bind them to events