knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:okfn/recline

Browse Source
This commit is contained in:
Rufus Pollock
2012-06-15 11:12:55 +01:00
parent 8fe04ddd4f b6eb375624
commit 87df9ea080
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/view.slickgrid.js
View File

@@ -135,23 +135,18 @@ my.SlickGrid = Backbone.View.extend({
this.grid = new Slick.Grid(this.el, data, visibleColumns, options); this.grid = new Slick.Grid(this.el, data, visibleColumns, options);
// Column sorting // Column sorting
var sortInfo = this.state.get('columnsSort'); var sortInfo = this.model.queryState.get('sort');
if (sortInfo.column){ if (sortInfo){
var sortAsc = !(sortInfo.order == 'desc'); var column = _.keys(sortInfo[0])[0];
this.grid.setSortColumn(sortInfo.column, sortAsc); var sortAsc = !(sortInfo[0][column].order == 'desc');
this.grid.setSortColumn(column, sortAsc);
} }
this.grid.onSort.subscribe(function(e, args){ this.grid.onSort.subscribe(function(e, args){
var order = (args.sortAsc) ? 'asc':'desc'; var order = (args.sortAsc) ? 'asc':'desc';
self.state.set({columnsSort:{
column:args.sortCol.field,
order: order
}});
var sort = [{}]; var sort = [{}];
sort[0][args.sortCol.field] = {order: order}; sort[0][args.sortCol.field] = {order: order};
self.model.query({sort: sort}); self.model.query({sort: sort});
}); });
this.grid.onColumnsReordered.subscribe(function(e, args){ this.grid.onColumnsReordered.subscribe(function(e, args){