Merge 3ec0e55 into c4688b1

esvit · Jan 9, 2014 · 7b79dde · 7b79dde
2 parents c4688b1 + 3ec0e55
commit 7b79dde
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ng-table.src.js b/ng-table.src.js
@@ -418,7 +418,8 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) {
             filter: {},
             sorting: {},
             group: {},
-            groupBy: null
+            groupBy: null,
+            defaultSort: 'desc'
         };
         var settings = {
             $scope: null, // set by ngTable controller
@@ -470,9 +471,11 @@ var ngTableController = ['$scope', 'ngTableParams', '$q', function($scope, ngTab
         if (!parsedSortable) {
             return;
         }
-        var sorting = $scope.params.sorting() && $scope.params.sorting()[parsedSortable] && ($scope.params.sorting()[parsedSortable] === "desc");
+        var defaultSort = $scope.params.$params.defaultSort;
+        var inverseSort = (defaultSort === 'asc' ? 'desc' : 'asc');
+        var sorting = $scope.params.sorting() && $scope.params.sorting()[parsedSortable] && ($scope.params.sorting()[parsedSortable] === defaultSort);
         var sortingParams = event.ctrlKey ? $scope.params.sorting() : {};
-        sortingParams[parsedSortable] = (sorting ? 'asc' : 'desc');
+        sortingParams[parsedSortable] = (sorting ? inverseSort : defaultSort);
         $scope.params.parameters({
             sorting: sortingParams
         });