Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Initial Sort Direction (issue #576) #628

Merged
merged 1 commit into from
Jan 27, 2014
Merged

Fix Initial Sort Direction (issue #576) #628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix initial sortInfo, allows users to specify multiple columns for so… 
…rting when initializing ng-grid
  • Loading branch information
@psgibbs
psgibbs committed Aug 14, 2013
commit 9a63285a8888f4891684ccf52af42a7bd735835e
21 changes: 13 additions & 8 deletions src/classes/grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,6 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
self.lastSortedColumns.push(c);
};
if (isArr) {
self.clearSortingData();
angular.forEach(col, function (c, i) {
c.sortPriority = i + 1;
push(c);
Expand All @@ -636,27 +635,33 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
col.sortPriority = undefined;
push(col);
}

self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
};
self.sortColumnsInit = function() {
if (self.config.sortInfo.columns) {
self.config.sortInfo.columns.length = 0;
} else {
self.config.sortInfo.columns = [];
}

var cols = [];
angular.forEach($scope.columns, function(c) {
var i = self.config.sortInfo.fields.indexOf(c.field);
if (i !== -1) {
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns[i] = c;
cols[i] = c;
}
});
angular.forEach(self.config.sortInfo.columns, function(c){
self.sortData(c);
});

if(cols.length === 1){
self.sortData(cols[0]);
}else{
self.sortData(cols);
}
};
self.sortActual = function() {
if (!self.config.useExternalSorting) {
Expand Down