diff --git a/fin-hypergrid.dev.html b/fin-hypergrid.dev.html index 824a8ae8d..3d41d8f87 100644 --- a/fin-hypergrid.dev.html +++ b/fin-hypergrid.dev.html @@ -21322,6 +21322,7 @@ + @@ -22405,6 +22406,7 @@ + @@ -22634,6 +22636,7 @@ + @@ -22917,6 +22920,7 @@ + @@ -23200,6 +23204,7 @@ + @@ -23523,6 +23528,7 @@ + \ No newline at end of file +
  • \ No newline at end of file diff --git a/local.json b/local.json new file mode 100644 index 000000000..df9a38957 --- /dev/null +++ b/local.json @@ -0,0 +1,26 @@ +{ + "devtools_port": 9090, + "startup_app": { + "autoShow": true, + "name": "hypergrid-demo", + "url": "http://openfin.github.io/fin-hypergrid/components/fin-hypergrid/demo.html", + "uuid": "hypergrid-demo", + "applicationIcon": "http://openfin.github.io/fin-hypergrid/components/fin-hypergrid/images/openfin.ico", + "contextMenu" : true + }, + "runtime": { + "arguments": "", + "version": "alpha", + "assets": [{ + "src": "http://10.9.98.117:8080/q.zip", + "dest": "q", + "version": "0.0.1" + }] + }, + "shortcut": { + "company": "OpenFin", + "description": "Hypergrid by OpenFin", + "icon": "http://openfin.github.io/fin-hypergrid/components/fin-hypergrid/images/openfin.ico", + "name": "Hypergrid-Demo-Local" + } +} diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-base.css b/polymer/css/behaviors/fin-hypergrid-behavior-base.css index 99ce03535..7a4a76847 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-base.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-base.css @@ -38,5 +38,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-default.css b/polymer/css/behaviors/fin-hypergrid-behavior-default.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-default.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-default.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-gol.css b/polymer/css/behaviors/fin-hypergrid-behavior-gol.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-gol.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-gol.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css b/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-in-memory.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-json.css b/polymer/css/behaviors/fin-hypergrid-behavior-json.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-json.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-json.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-q.css b/polymer/css/behaviors/fin-hypergrid-behavior-q.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-q.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-q.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css b/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-qtree.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css b/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css index 9caf50063..13b15d77e 100644 --- a/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css +++ b/polymer/css/behaviors/fin-hypergrid-behavior-web-worker.css @@ -8,3 +8,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-base.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-choice.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-color.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-date.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-simple.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-slider.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-spinner.css @@ -142,5 +142,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 5c643e841..d53bb4c8e 100644 --- a/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css +++ b/polymer/css/cell-editors/fin-hypergrid-cell-editor-textfield.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/data.css b/polymer/css/data.css index 34a802a48..5f4771767 100644 --- a/polymer/css/data.css +++ b/polymer/css/data.css @@ -92,5 +92,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-base.css b/polymer/css/features/fin-hypergrid-feature-base.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-base.css +++ b/polymer/css/features/fin-hypergrid-feature-base.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-click.css b/polymer/css/features/fin-hypergrid-feature-cell-click.css index 761994371..07b468e6a 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-click.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-click.css @@ -56,5 +56,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-editing.css b/polymer/css/features/fin-hypergrid-feature-cell-editing.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-editing.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-editing.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-cell-selection.css b/polymer/css/features/fin-hypergrid-feature-cell-selection.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-cell-selection.css +++ b/polymer/css/features/fin-hypergrid-feature-cell-selection.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-moving.css b/polymer/css/features/fin-hypergrid-feature-column-moving.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-moving.css +++ b/polymer/css/features/fin-hypergrid-feature-column-moving.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-resizing.css b/polymer/css/features/fin-hypergrid-feature-column-resizing.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-resizing.css +++ b/polymer/css/features/fin-hypergrid-feature-column-resizing.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-column-sorting.css b/polymer/css/features/fin-hypergrid-feature-column-sorting.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-column-sorting.css +++ b/polymer/css/features/fin-hypergrid-feature-column-sorting.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-key-paging.css b/polymer/css/features/fin-hypergrid-feature-key-paging.css index 046265fb1..2815e8119 100644 --- a/polymer/css/features/fin-hypergrid-feature-key-paging.css +++ b/polymer/css/features/fin-hypergrid-feature-key-paging.css @@ -11,3 +11,4 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-on-hover.css b/polymer/css/features/fin-hypergrid-feature-on-hover.css index a283576f7..6a7257f1a 100644 --- a/polymer/css/features/fin-hypergrid-feature-on-hover.css +++ b/polymer/css/features/fin-hypergrid-feature-on-hover.css @@ -64,5 +64,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-overlay.css b/polymer/css/features/fin-hypergrid-feature-overlay.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-overlay.css +++ b/polymer/css/features/fin-hypergrid-feature-overlay.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-row-resizing.css b/polymer/css/features/fin-hypergrid-feature-row-resizing.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-row-resizing.css +++ b/polymer/css/features/fin-hypergrid-feature-row-resizing.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css b/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css +++ b/polymer/css/features/fin-hypergrid-feature-thumbwheel-scrolling.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/fin-hypergrid-cell-provider.css b/polymer/css/fin-hypergrid-cell-provider.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/fin-hypergrid-cell-provider.css +++ b/polymer/css/fin-hypergrid-cell-provider.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/fin-hypergrid-excel.css b/polymer/css/fin-hypergrid-excel.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/fin-hypergrid-excel.css +++ b/polymer/css/fin-hypergrid-excel.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/fin-hypergrid-renderer.css b/polymer/css/fin-hypergrid-renderer.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/fin-hypergrid-renderer.css +++ b/polymer/css/fin-hypergrid-renderer.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/fin-hypergrid-selection-model.css b/polymer/css/fin-hypergrid-selection-model.css index 5c643e841..d53bb4c8e 100644 --- a/polymer/css/fin-hypergrid-selection-model.css +++ b/polymer/css/fin-hypergrid-selection-model.css @@ -142,5 +142,6 @@ + diff --git a/polymer/css/fin-hypergrid.css b/polymer/css/fin-hypergrid.css index 297137d95..16b97701b 100644 --- a/polymer/css/fin-hypergrid.css +++ b/polymer/css/fin-hypergrid.css @@ -208,5 +208,6 @@ fin-vampire-bar { + diff --git a/polymer/js/behaviors/fin-hypergrid-behavior-in-memory.js b/polymer/js/behaviors/fin-hypergrid-behavior-in-memory.js index 25fc5b751..458d8e292 100644 --- a/polymer/js/behaviors/fin-hypergrid-behavior-in-memory.js +++ b/polymer/js/behaviors/fin-hypergrid-behavior-in-memory.js @@ -50,7 +50,7 @@ this.tableState.sorts = []; this.tableState.sortLookup = {}; this.tableState.sorted = {}; - this.sortStates = [' -', ' ^', ' v']; + this.sortStates = [' -', ' ↑', ' ↓']; this.permuteInterval = 250; this.values = new Array(this.rows * this.columns); diff --git a/polymer/js/behaviors/fin-hypergrid-behavior-json.js b/polymer/js/behaviors/fin-hypergrid-behavior-json.js index 06631d78b..9af102c31 100644 --- a/polymer/js/behaviors/fin-hypergrid-behavior-json.js +++ b/polymer/js/behaviors/fin-hypergrid-behavior-json.js @@ -15,7 +15,7 @@ var validIdentifierMatch = /^(?!(?:abstract|boolean|break|byte|case|catch|char|c ready: function() { this.readyInit(); this.tableState.sorted = []; - this.sortStates = [' ', ' \u2191', ' \u2193']; + this.sortStates = [' ', ' ↑', ' ↓']; }, isValidIdentifer: function(string) { diff --git a/polymer/js/behaviors/fin-hypergrid-behavior-qtree.js b/polymer/js/behaviors/fin-hypergrid-behavior-qtree.js index de4b67f29..bd8cdcde4 100644 --- a/polymer/js/behaviors/fin-hypergrid-behavior-qtree.js +++ b/polymer/js/behaviors/fin-hypergrid-behavior-qtree.js @@ -59,16 +59,16 @@ //sort states are also the visual queues in the column headers //* '' no sort - //* ^ sort ascending - //* v sort descending - //* |^| sort absolute value ascending - //* |v| sort absolute value descending; + //* ↑ sort ascending + //* ↓ sort descending + //* ⤒ sort absolute value ascending + //* ⤓ sort absolute value descending; // \u25be var sortMap = { - a: '\u2191', - d: '\u2193', - A: '\u2912', - D: '\u2913' + a: '↑', //'\u2191', + d: '↓', //'\u2193', + A: '⤒', //'\u2912', + D: '⤓', //'\u2913' }; var sortStates = { diff --git a/polymer/js/fin-hypergrid.js b/polymer/js/fin-hypergrid.js index a9618c364..dc96529e1 100644 --- a/polymer/js/fin-hypergrid.js +++ b/polymer/js/fin-hypergrid.js @@ -1485,9 +1485,7 @@ * @method scrollHBy(offsetX) */ scrollHBy: function(offsetX) { - var max = this.sbHScrlCfg.rangeStop; var oldValue = this.getHScrollValue(); - var newValue = Math.min(max, Math.max(0, oldValue + offsetX)); if (newValue === oldValue) { return; } @@ -1608,6 +1606,8 @@ * @method setVScrollValue(y) */ setVScrollValue: function(y) { + var max = this.sbVScrlCfg.rangeStop; + y = Math.min(max, Math.max(0, y)); var self = this; this.getBehavior()._setScrollPositionY(y); var oldY = this.vScrlValue; @@ -1638,6 +1638,8 @@ * @method setHScrollValue(x) */ setHScrollValue: function(x) { + var max = this.sbHScrlCfg.rangeStop; + x = Math.min(max, Math.max(0, x)); var self = this; this.getBehavior()._setScrollPositionX(x); var oldX = this.hScrlValue;