From a8508008413fcb6e621ecdc2e43db466d72bd2cc Mon Sep 17 00:00:00 2001 From: Jonathan Eiten Date: Sun, 7 Aug 2016 23:20:59 -0400 Subject: [PATCH 1/2] added DataSourceSorterComposite back into default pipeline --- src/dataModels/JSON.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dataModels/JSON.js b/src/dataModels/JSON.js index bfb1a9c18..2b86e81de 100644 --- a/src/dataModels/JSON.js +++ b/src/dataModels/JSON.js @@ -314,6 +314,7 @@ var JSON = DataModel.extend('dataModels.JSON', { */ pipeline: [ { type: 'JSDataSource' }, + { type: 'DataSourceSorterComposite' }, ], /** From 3891b8f9894efe6e46fe1c75177bbf22c5a321ed Mon Sep 17 00:00:00 2001 From: Jonathan Eiten Date: Sun, 7 Aug 2016 23:27:08 -0400 Subject: [PATCH 2/2] added DataSourceGlobalFilter back into default pipeline --- src/dataModels/JSON.js | 1 + version-history.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dataModels/JSON.js b/src/dataModels/JSON.js index 2b86e81de..55cecbcd1 100644 --- a/src/dataModels/JSON.js +++ b/src/dataModels/JSON.js @@ -314,6 +314,7 @@ var JSON = DataModel.extend('dataModels.JSON', { */ pipeline: [ { type: 'JSDataSource' }, + { type: 'DataSourceGlobalFilter' }, { type: 'DataSourceSorterComposite' }, ], diff --git a/version-history.md b/version-history.md index 7d1d9b0b6..55986e313 100644 --- a/version-history.md +++ b/version-history.md @@ -29,11 +29,11 @@ * If the cell value is a function, however, legacy behavior is maintained: This function takes priority over the column function. * Upon selecting a new operator from a column filter cell's dropdown, rather than inserting the new operator at the cursor position, the old operator is now _replaced_ by the new one the operator. If the column filter cell contains several expressions (_i.e.,_ concatenated with `and`, `or`, or `nor`), the operator in the expression under the cursor is replaced. * Group view - * Aggregations and Group View have been added as add-ons and removed from HyperGrid core - * The aggregations add-on has the same behavior as before while the Group View is a view of the original columns, with drill downs in the tree cell for expanding the groups provided - * Hypergrid now only loads with the original Datasource and filter datasource as defaults + * Aggregations and Group View have been added as add-ons and removed from HyperGrid core. + * The aggregations add-on has the same behavior as before while the Group View is a view of the original columns, with drill downs in the tree cell for expanding the groups provided. + * Hypergrid now only loads with the original data source, the filter datasource as defaults, and the sorter data source. * Demo 1: [`aggregations.html`](http://openfin.github.io/fin-hypergrid/aggregations-view.html) - * See Group Demo for example usage: [`group.html`](http://openfin.github.io/fin-hypergrid/group-view.html) + * See Group Demo for example usage: [`group.html`](http://openfin.github.io/fin-hypergrid/group-view.html). ### 1.0.7 - 18 July 2016