Performance improvement

angular-ui · Nov 3, 2014 · c556faf · c556faf
1 parent 7e89d78
commit c556faf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/js/core/directives/ui-grid-native-scrollbar.js b/src/js/core/directives/ui-grid-native-scrollbar.js
@@ -80,7 +80,8 @@
           // Update the vertical scrollbar's content height so it's the same as the canvas
           var contentHeight = rowContainer.getCanvasHeight();
 
-          var headerHeight = gridUtil.outerElementHeight(containerCtrl.header);
+          //var headerHeight = gridUtil.outerElementHeight(containerCtrl.header);
+          var headerHeight = colContainer.headerHeight ? colContainer.headerHeight : grid.headerHeight;
 
           // gridUtil.logDebug('headerHeight in scrollbar', headerHeight);
 

diff --git a/src/js/core/factories/GridOptions.js b/src/js/core/factories/GridOptions.js
@@ -128,8 +128,11 @@ angular.module('ui.grid')
       baseOptions.getRowIdentity = baseOptions.getRowIdentity || function getRowIdentity(row) {
         return row.$$hashKey;
       };
-
-      baseOptions.headerRowHeight = typeof(baseOptions.headerRowHeight) !== "undefined" ? baseOptions.headerRowHeight : 30;
+      if (baseOptions.hideHeader){
+        baseOptions.headerRowHeight = 0;
+      }else {
+        baseOptions.headerRowHeight = typeof(baseOptions.headerRowHeight) !== "undefined" ? baseOptions.headerRowHeight : 30;
+      }
       baseOptions.rowHeight = baseOptions.rowHeight || 30;
       baseOptions.maxVisibleRowCount = baseOptions.maxVisibleRowCount || 200;