fix to not collapse headers if no data

garaboncias · Aug 3, 2013 · dafd06b · dafd06b
1 parent 599144d
commit dafd06b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/webapp/css/lib/angular-table.css b/src/main/webapp/css/lib/angular-table.css
@@ -7,6 +7,7 @@
 .angularTableHeaderTableContainer {
     width: 100%;
     height: 32px;
+    box-sizing: border-box;
 }
 
 .angularTableTableContainer {

diff --git a/src/main/webapp/js/lib/angular-table.js b/src/main/webapp/js/lib/angular-table.js
@@ -58,10 +58,10 @@ angular.module('angular-table', [])
                     // must be idempotent and as such shouldn't rely on it being any specific number.
                     scope.$watch('ResizeWidthEvent', function() {
                         // pull the computed width of the scrolling container out of the dom
-                        var scrollingContainerComputedWidth = JqLiteExtension.getComputedWidthAsFloat(iElement.next()[0]);
+                        var scrollBarWidth = JqLiteExtension.getComputedWidthAsFloat(iElement[0]) - JqLiteExtension.getComputedWidthAsFloat(iElement.next()[0]);
 
-                        iElement.css('width', scrollingContainerComputedWidth + 'px');
-                        Instrumentation.log('headerRow', 'header width set', scrollingContainerComputedWidth + 'px');
+                        iElement.css('paddingRight', scrollBarWidth + 'px');
+                        Instrumentation.log('headerRow', 'header paddingRight set', scrollBarWidth + 'px');
                     }, true);
                 };
             }