From b6eb375624f8b5f4d8037046ad4a90ecf25cd0e1 Mon Sep 17 00:00:00 2001 From: amercader Date: Tue, 12 Jun 2012 13:22:39 +0100 Subject: [PATCH] [#130,view/slickgrid] Don't store sort info on state, as it is stored on the query --- src/view.slickgrid.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/view.slickgrid.js b/src/view.slickgrid.js index 1f49b6ee..0c506760 100644 --- a/src/view.slickgrid.js +++ b/src/view.slickgrid.js @@ -135,23 +135,18 @@ my.SlickGrid = Backbone.View.extend({ this.grid = new Slick.Grid(this.el, data, visibleColumns, options); // Column sorting - var sortInfo = this.state.get('columnsSort'); - if (sortInfo.column){ - var sortAsc = !(sortInfo.order == 'desc'); - this.grid.setSortColumn(sortInfo.column, sortAsc); + var sortInfo = this.model.queryState.get('sort'); + if (sortInfo){ + var column = _.keys(sortInfo[0])[0]; + var sortAsc = !(sortInfo[0][column].order == 'desc'); + this.grid.setSortColumn(column, sortAsc); } this.grid.onSort.subscribe(function(e, args){ var order = (args.sortAsc) ? 'asc':'desc'; - self.state.set({columnsSort:{ - column:args.sortCol.field, - order: order - }}); - var sort = [{}]; sort[0][args.sortCol.field] = {order: order}; self.model.query({sort: sort}); - }); this.grid.onColumnsReordered.subscribe(function(e, args){