diff --git a/fin-hypergrid.dev.html b/fin-hypergrid.dev.html index 84b2bac69..1deb6c0bb 100644 --- a/fin-hypergrid.dev.html +++ b/fin-hypergrid.dev.html @@ -15443,6 +15443,7 @@ + @@ -17229,6 +17230,7 @@ + @@ -17599,6 +17601,7 @@ + @@ -18016,6 +18019,7 @@ + @@ -18546,6 +18550,7 @@ + @@ -19046,6 +19051,7 @@ + @@ -19188,6 +19194,7 @@ + @@ -19403,6 +19410,7 @@ + @@ -19706,7 +19714,7 @@ * @param {fin-hypergrid} grid - [fin-hypergrid](module-._fin-hypergrid.html) */ handleDOWNSHIFT: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveShiftSelect(grid, 0, count); }, @@ -19719,7 +19727,7 @@ * @param {Object} event - the event details */ handleUPSHIFT: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveShiftSelect(grid, 0, -count); }, @@ -19756,7 +19764,7 @@ * @param {Object} event - the event details */ handleDOWN: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveSingleSelect(grid, 0, count); }, @@ -19769,7 +19777,7 @@ * @param {Object} event - the event details */ handleUP: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveSingleSelect(grid, 0, -count); }, @@ -19804,7 +19812,10 @@ If we are holding down the same navigation key, accelerate the increment we scroll * #### returns: integer */ - getAutoScrollAcceleration: function() { + getAutoScrollAcceleration: function(grid) { + if (!grid.isAutoScrollAcceleration()) { + return 1; + } var count = 1; var elapsed = this.getAutoScrollDuration() / 2000; count = Math.max(1, Math.floor(elapsed * elapsed * elapsed * elapsed)); @@ -20125,6 +20136,7 @@ + @@ -20515,6 +20527,7 @@ + @@ -20737,6 +20750,7 @@ + @@ -20971,6 +20985,7 @@ + @@ -21210,6 +21225,7 @@ + @@ -21733,6 +21749,7 @@ + @@ -22575,6 +22592,7 @@ + @@ -22875,6 +22893,7 @@ + @@ -22928,6 +22947,7 @@ } + --> - \ No newline at end of file + \ No newline at end of file diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-base.css b/polymer/css/behaviors/fin-hypergrid-behavior-base.css index 5b8544963..ed012fa33 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-base.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-base.css @@ -70,5 +70,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-default.css b/polymer/css/behaviors/fin-hypergrid-behavior-default.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-default.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-default.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-gol.css b/polymer/css/behaviors/fin-hypergrid-behavior-gol.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-gol.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-gol.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css b/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-json.css b/polymer/css/behaviors/fin-hypergrid-behavior-json.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-json.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-json.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-q.css b/polymer/css/behaviors/fin-hypergrid-behavior-q.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-q.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-q.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css b/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css b/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css index 99ce03535..7a4a76847 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css @@ -38,5 +38,6 @@ + diff --git a/polymer/css/bitset.min.css b/polymer/css/bitset.min.css index 1c762e028..286d746f6 100644 --- a/polymer/css/bitset.min.css +++ b/polymer/css/bitset.min.css @@ -4,3 +4,4 @@ } + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css b/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/data-models/fin-hypergrid-data-model-base.css b/polymer/css/data-models/fin-hypergrid-data-model-base.css index 1c762e028..286d746f6 100644 --- a/polymer/css/data-models/fin-hypergrid-data-model-base.css +++ b/polymer/css/data-models/fin-hypergrid-data-model-base.css @@ -4,3 +4,4 @@ } + diff --git a/polymer/css/data.css b/polymer/css/data.css index 232653914..9d8cff417 100644 --- a/polymer/css/data.css +++ b/polymer/css/data.css @@ -124,5 +124,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-base.css b/polymer/css/features/fin-hypergrid-feature-base.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-base.css +++ b/polymer/css/features/fin-hypergrid-feature-base.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-click.css b/polymer/css/features/fin-hypergrid-feature-cell-click.css index 4239a8401..394e076fb 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-click.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-click.css @@ -88,5 +88,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-editing.css b/polymer/css/features/fin-hypergrid-feature-cell-editing.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-editing.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-editing.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-selection.css b/polymer/css/features/fin-hypergrid-feature-cell-selection.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-selection.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-selection.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-autosizing.css b/polymer/css/features/fin-hypergrid-feature-column-autosizing.css index 1c762e028..286d746f6 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-autosizing.css +++ b/polymer/css/features/fin-hypergrid-feature-column-autosizing.css @@ -4,3 +4,4 @@ } + diff --git a/polymer/css/features/fin-hypergrid-feature-column-moving.css b/polymer/css/features/fin-hypergrid-feature-column-moving.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-moving.css +++ b/polymer/css/features/fin-hypergrid-feature-column-moving.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-resizing.css b/polymer/css/features/fin-hypergrid-feature-column-resizing.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-resizing.css +++ b/polymer/css/features/fin-hypergrid-feature-column-resizing.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-selection.css b/polymer/css/features/fin-hypergrid-feature-column-selection.css index 1c762e028..286d746f6 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-selection.css +++ b/polymer/css/features/fin-hypergrid-feature-column-selection.css @@ -4,3 +4,4 @@ } + diff --git a/polymer/css/features/fin-hypergrid-feature-column-sorting.css b/polymer/css/features/fin-hypergrid-feature-column-sorting.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-sorting.css +++ b/polymer/css/features/fin-hypergrid-feature-column-sorting.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-key-paging.css b/polymer/css/features/fin-hypergrid-feature-key-paging.css index 76587ab94..a06f660a3 100644 --- a/polymer/css/features/fin-hypergrid-feature-key-paging.css +++ b/polymer/css/features/fin-hypergrid-feature-key-paging.css @@ -41,5 +41,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-on-hover.css b/polymer/css/features/fin-hypergrid-feature-on-hover.css index 715f0a6a0..997476780 100644 --- a/polymer/css/features/fin-hypergrid-feature-on-hover.css +++ b/polymer/css/features/fin-hypergrid-feature-on-hover.css @@ -96,5 +96,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-overlay.css b/polymer/css/features/fin-hypergrid-feature-overlay.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-overlay.css +++ b/polymer/css/features/fin-hypergrid-feature-overlay.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-row-resizing.css b/polymer/css/features/fin-hypergrid-feature-row-resizing.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-row-resizing.css +++ b/polymer/css/features/fin-hypergrid-feature-row-resizing.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css b/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css +++ b/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/fin-hypergrid-cell-provider.css b/polymer/css/fin-hypergrid-cell-provider.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/fin-hypergrid-cell-provider.css +++ b/polymer/css/fin-hypergrid-cell-provider.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/fin-hypergrid-excel.css b/polymer/css/fin-hypergrid-excel.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/fin-hypergrid-excel.css +++ b/polymer/css/fin-hypergrid-excel.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/fin-hypergrid-renderer.css b/polymer/css/fin-hypergrid-renderer.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/fin-hypergrid-renderer.css +++ b/polymer/css/fin-hypergrid-renderer.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/fin-hypergrid-selection-model.css b/polymer/css/fin-hypergrid-selection-model.css index 0fc6f4698..c64baef7b 100644 --- a/polymer/css/fin-hypergrid-selection-model.css +++ b/polymer/css/fin-hypergrid-selection-model.css @@ -174,5 +174,6 @@ + diff --git a/polymer/css/fin-hypergrid.css b/polymer/css/fin-hypergrid.css index ac5a29253..c8284caab 100644 --- a/polymer/css/fin-hypergrid.css +++ b/polymer/css/fin-hypergrid.css @@ -240,5 +240,6 @@ fin-vampire-bar { + diff --git a/polymer/js/features/fin-hypergrid-feature-cell-selection.js b/polymer/js/features/fin-hypergrid-feature-cell-selection.js index 219edfa38..0fc28f4e5 100644 --- a/polymer/js/features/fin-hypergrid-feature-cell-selection.js +++ b/polymer/js/features/fin-hypergrid-feature-cell-selection.js @@ -297,7 +297,7 @@ * @param {fin-hypergrid} grid - [fin-hypergrid](module-._fin-hypergrid.html) */ handleDOWNSHIFT: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveShiftSelect(grid, 0, count); }, @@ -310,7 +310,7 @@ * @param {Object} event - the event details */ handleUPSHIFT: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveShiftSelect(grid, 0, -count); }, @@ -347,7 +347,7 @@ * @param {Object} event - the event details */ handleDOWN: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveSingleSelect(grid, 0, count); }, @@ -360,7 +360,7 @@ * @param {Object} event - the event details */ handleUP: function(grid) { - var count = this.getAutoScrollAcceleration(); + var count = this.getAutoScrollAcceleration(grid); this.moveSingleSelect(grid, 0, -count); }, @@ -395,7 +395,10 @@ If we are holding down the same navigation key, accelerate the increment we scroll * #### returns: integer */ - getAutoScrollAcceleration: function() { + getAutoScrollAcceleration: function(grid) { + if (!grid.isAutoScrollAcceleration()) { + return 1; + } var count = 1; var elapsed = this.getAutoScrollDuration() / 2000; count = Math.max(1, Math.floor(elapsed * elapsed * elapsed * elapsed)); diff --git a/polymer/js/fin-hypergrid.js b/polymer/js/fin-hypergrid.js index a3e7bcdb8..3b1149c6a 100644 --- a/polymer/js/fin-hypergrid.js +++ b/polymer/js/fin-hypergrid.js @@ -94,7 +94,8 @@ useHiDPI: true, editorActivationKeys: ['alt', 'esc'], columnAutosizing: true, - readOnly: false + readOnly: false, + autoScrollAcceleration: true }; return properties; @@ -1135,6 +1136,9 @@ return this.resolveProperty('useHiDPI') !== false; }, + isAutoScrollAcceleration: function() { + return this.resolveProperty('autoScrollAcceleration') !== false; + }, /** * @function * @instance