Merge pull request #208 from tentativafc/master

Call point to defaultSort setting.
esvit · Feb 27, 2014 · 5ff8d1c · 5ff8d1c
2 parents 76ca104 + de6d1ef
commit 5ff8d1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ng-table.min.js b/ng-table.min.js
diff --git a/ng-table.src.js b/ng-table.src.js
@@ -494,7 +494,7 @@ var ngTableController = ['$scope', 'ngTableParams', '$q', function ($scope, ngTa
         if (!parsedSortable) {
             return;
         }
-        var defaultSort = $scope.params.$params.defaultSort;
+        var defaultSort = $scope.params.settings().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() : {};

diff --git a/src/scripts/04-controller.js b/src/scripts/04-controller.js
@@ -46,7 +46,7 @@ var ngTableController = ['$scope', 'ngTableParams', '$q', function ($scope, ngTa
         if (!parsedSortable) {
             return;
         }
-        var defaultSort = $scope.params.$params.defaultSort;
+        var defaultSort = $scope.params.settings().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() : {};