feat(GridRenderContainer): Added WHEN_NEEDED option back to ui-grid.

Author: Portugal, Marcelo

src/js/core/constants.js

@@ -227,12 +227,13 @@
      * Available options are:
      * - `uiGridConstants.scrollbars.NEVER` - never show scrollbars in this direction
      * - `uiGridConstants.scrollbars.ALWAYS` - always show scrollbars in this direction
+     * - `uiGridConstants.scrollbars.WHEN_NEEDED` - shows scrollbars in this direction when needed
      */
 
     scrollbars: {
       NEVER: 0,
-      ALWAYS: 1
-      //WHEN_NEEDED: 2
+      ALWAYS: 1,
+      WHEN_NEEDED: 2
     }
   });
 

src/js/core/factories/GridOptions.js

@@ -410,7 +410,7 @@ angular.module('ui.grid')
        * @propertyOf ui.grid.class:GridOptions
        * @description {@link ui.grid.service:uiGridConstants#properties_scrollbars uiGridConstants.scrollbars.ALWAYS} by default.
        * This settings controls the vertical scrollbar for the grid.
-       * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+       * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER, uiGridConstants.scrollbars.WHEN_NEEDED
        */
       baseOptions.enableVerticalScrollbar = typeof(baseOptions.enableVerticalScrollbar) !== "undefined" ? baseOptions.enableVerticalScrollbar : uiGridConstants.scrollbars.ALWAYS;
 
@@ -420,7 +420,7 @@ angular.module('ui.grid')
        * @propertyOf ui.grid.class:GridOptions
        * @description {@link ui.grid.service:uiGridConstants#properties_scrollbars uiGridConstants.scrollbars.ALWAYS} by default.
        * This settings controls the horizontal scrollbar for the grid.
-       * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+       * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER, uiGridConstants.scrollbars.WHEN_NEEDED
        */
       baseOptions.enableHorizontalScrollbar = typeof(baseOptions.enableHorizontalScrollbar) !== "undefined" ? baseOptions.enableHorizontalScrollbar : uiGridConstants.scrollbars.ALWAYS;
 

src/js/core/factories/GridRenderContainer.js

@@ -770,6 +770,10 @@ angular.module('ui.grid')
   GridRenderContainer.prototype.getViewportStyle = function () {
     var self = this;
     var styles = {};
+    var scrollbarVisibility = {};
+
+    scrollbarVisibility[uiGridConstants.scrollbars.ALWAYS] = 'scroll';
+    scrollbarVisibility[uiGridConstants.scrollbars.WHEN_NEEDED] = 'auto';
 
     self.hasHScrollbar = false;
     self.hasVScrollbar = false;
@@ -800,8 +804,8 @@ angular.module('ui.grid')
       self.hasVScrollbar = !self.grid.isRTL() ? self.grid.options.enableVerticalScrollbar !== uiGridConstants.scrollbars.NEVER : false;
     }
 
-    styles['overflow-x'] = self.hasHScrollbar ? 'scroll' : 'hidden';
-    styles['overflow-y'] = self.hasVScrollbar ? 'scroll' : 'hidden';
+    styles['overflow-x'] = self.hasHScrollbar ? scrollbarVisibility[self.grid.options.enableHorizontalScrollbar] : 'hidden';
+    styles['overflow-y'] = self.hasVScrollbar ? scrollbarVisibility[self.grid.options.enableVerticalScrollbar] : 'hidden';
 
     return styles;
   };

test/unit/core/factories/GridRenderContainer.spec.js

@@ -57,6 +57,18 @@ describe('GridRenderContainer factory', function() {
 			expect(r.getViewportStyle()).toEqual({'overflow-x': 'hidden', 'overflow-y': 'scroll'});
 		});
 
+		it('should have a vert scrollbar only when needed', function() {
+			r.name = 'body';
+			grid.options.enableVerticalScrollbar = uiGridConstants.scrollbars.WHEN_NEEDED;
+			expect(r.getViewportStyle()).toEqual({'overflow-x': 'scroll', 'overflow-y': 'auto'});
+		});
+
+		it('should have a horiz scrollbar only when needed', function() {
+			r.name = 'body';
+			grid.options.enableHorizontalScrollbar = uiGridConstants.scrollbars.WHEN_NEEDED;
+			expect(r.getViewportStyle()).toEqual({'overflow-x': 'auto', 'overflow-y': 'scroll'});
+		});
+
 		it('left should have a no scrollbar when not rtl', function() {
 			r.name = 'left';
 			expect(r.getViewportStyle()).toEqual({'overflow-x': 'hidden', 'overflow-y': 'hidden'});