Skip to content

Commit

Permalink
docs(scrollThreshold): Add missing documentation details.
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Removed horizontalScrollThreshold as it is not being used by the grid.
  • Loading branch information
Portugal, Marcelo authored and mportuga committed Jun 20, 2018
1 parent f482800 commit cc0fdb7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
12 changes: 3 additions & 9 deletions src/js/core/factories/GridOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,11 +317,13 @@ angular.module('ui.grid')
* Defaults to 4
*/
baseOptions.excessRows = typeof(baseOptions.excessRows) !== "undefined" ? baseOptions.excessRows : 4;

/**
* @ngdoc property
* @name scrollThreshold
* @propertyOf ui.grid.class:GridOptions
* @description Defaults to 4
* @description Throttles the grid scrolling by the amount of rows set, which helps with smoothness of scrolling.
* Defaults to 4.
*/
baseOptions.scrollThreshold = typeof(baseOptions.scrollThreshold) !== "undefined" ? baseOptions.scrollThreshold : 4;

Expand All @@ -333,14 +335,6 @@ angular.module('ui.grid')
* Defaults to 4
*/
baseOptions.excessColumns = typeof(baseOptions.excessColumns) !== "undefined" ? baseOptions.excessColumns : 4;
/**
* @ngdoc property
* @name horizontalScrollThreshold
* @propertyOf ui.grid.class:GridOptions
* @description Defaults to 4
*/
baseOptions.horizontalScrollThreshold = typeof(baseOptions.horizontalScrollThreshold) !== "undefined" ? baseOptions.horizontalScrollThreshold : 2;


/**
* @ngdoc property
Expand Down
5 changes: 0 additions & 5 deletions test/unit/core/factories/GridOptions.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ describe('GridOptions factory', function () {
excessRows: 4,
scrollThreshold: 4,
excessColumns: 4,
horizontalScrollThreshold: 2,
aggregationCalcThrottle: 500,
wheelScrollThrottle: 70,
scrollDebounce: 300,
Expand Down Expand Up @@ -82,7 +81,6 @@ describe('GridOptions factory', function () {
excessRows: 5,
scrollThreshold: 6,
excessColumns: 7,
horizontalScrollThreshold: 3,
aggregationCalcThrottle: 1000,
wheelScrollThrottle: 75,
enableSorting: true,
Expand Down Expand Up @@ -125,7 +123,6 @@ describe('GridOptions factory', function () {
excessRows: 5,
scrollThreshold: 6,
excessColumns: 7,
horizontalScrollThreshold: 3,
aggregationCalcThrottle: 1000,
wheelScrollThrottle: 75,
scrollDebounce: 300,
Expand Down Expand Up @@ -173,7 +170,6 @@ describe('GridOptions factory', function () {
excessRows: 5,
scrollThreshold: 6,
excessColumns: 7,
horizontalScrollThreshold: 3,
aggregationCalcThrottle: 1000,
wheelScrollThrottle: 75,
enableFiltering: false,
Expand Down Expand Up @@ -215,7 +211,6 @@ describe('GridOptions factory', function () {
excessRows: 5,
scrollThreshold: 6,
excessColumns: 7,
horizontalScrollThreshold: 3,
aggregationCalcThrottle: 1000,
wheelScrollThrottle: 75,
scrollDebounce: 300,
Expand Down

0 comments on commit cc0fdb7

Please sign in to comment.