Skip to content

Allow unsort #310

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

Open
dfsq wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow unsort #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
552cd5d
#284 Missing AMD definition fix in the 01-into.js.
dfsq May 10, 2014
921f6c8
Allow sorting unsort.
dfsq May 12, 2014
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
1 change: 1 addition & 0 deletions examples/demo3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ <h1>Table with sorting</h1>
name: 'asc' // initial sorting
}
}, {
allowUnsort: true,
total: data.length, // length of data
getData: function($defer, params) {
// use build-in angular filter
Expand Down
36 changes: 31 additions & 5 deletions ng-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) {
data: null, //allows data to be set when table is initialized
total: 0,
defaultSort: 'desc',
allowUnsort: false,
filterDelay: 750,
counts: [10, 25, 50, 100],
getGroups: this.getGroups,
Expand Down Expand Up @@ -496,11 +497,36 @@ var ngTableController = ['$scope', 'ngTableParams', '$timeout', function ($scope
if (!parsedSortable) {
return;
}
var defaultSort = $scope.params.settings().defaultSort;

var settings = $scope.params.settings();
var defaultSort = 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 || event.metaKey) ? $scope.params.sorting() : {};
sortingParams[parsedSortable] = (sorting ? inverseSort : defaultSort);

var multipleSort = (event.ctrlKey || event.metaKey);

var sorting = $scope.params.sorting(), newSort = defaultSort;
if (sorting && sorting[parsedSortable]) {

if (settings.allowUnsort) {
if (sorting[parsedSortable] === defaultSort) {
newSort = inverseSort;
} else if (sorting[parsedSortable] === inverseSort) {
newSort = false;
} else {
newSort = defaultSort;
}
} else {
newSort = sorting[parsedSortable] === defaultSort ? inverseSort : defaultSort;
}
}

var sortingParams = multipleSort ? $scope.params.sorting() : {};
if (newSort) {
sortingParams[parsedSortable] = newSort;
} else {
delete sortingParams[parsedSortable];
}

$scope.params.parameters({
sorting: sortingParams
});
Expand Down Expand Up @@ -719,4 +745,4 @@ angular.module('ngTable').run(['$templateCache', function ($templateCache) {
$templateCache.put('ng-table/pager.html', '<div class="ng-cloak ng-table-pager"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">&laquo;</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">&raquo;</a> </li> </ul> </div> ');
}]);
return app;
}));
}));
2 changes: 1 addition & 1 deletion ng-table.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ng-table.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/scripts/01-intro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
} else {
return factory(angular);
}
}(angular || null, function(angular) {
}(typeof(angular) === 'undefined' ? null : angular, function(angular) {
'use strict';
1 change: 1 addition & 0 deletions src/scripts/03-params.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ app.factory('ngTableParams', ['$q', '$log', function ($q, $log) {
data: null, //allows data to be set when table is initialized
total: 0,
defaultSort: 'desc',
allowUnsort: false,
filterDelay: 750,
counts: [10, 25, 50, 100],
getGroups: this.getGroups,
Expand Down
33 changes: 29 additions & 4 deletions src/scripts/04-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,36 @@ var ngTableController = ['$scope', 'ngTableParams', '$timeout', function ($scope
if (!parsedSortable) {
return;
}
var defaultSort = $scope.params.settings().defaultSort;

var settings = $scope.params.settings();
var defaultSort = 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 || event.metaKey) ? $scope.params.sorting() : {};
sortingParams[parsedSortable] = (sorting ? inverseSort : defaultSort);

var multipleSort = (event.ctrlKey || event.metaKey);

var sorting = $scope.params.sorting(), newSort = defaultSort;
if (sorting && sorting[parsedSortable]) {

if (settings.allowUnsort) {
if (sorting[parsedSortable] === defaultSort) {
newSort = inverseSort;
} else if (sorting[parsedSortable] === inverseSort) {
newSort = false;
} else {
newSort = defaultSort;
}
} else {
newSort = sorting[parsedSortable] === defaultSort ? inverseSort : defaultSort;
}
}

var sortingParams = multipleSort ? $scope.params.sorting() : {};
if (newSort) {
sortingParams[parsedSortable] = newSort;
} else {
delete sortingParams[parsedSortable];
}

$scope.params.parameters({
sorting: sortingParams
});
Expand Down
2 changes: 2 additions & 0 deletions test/tableParamsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ describe('ngTableParams', function () {
data: null,
total: 0,
defaultSort : 'desc',
allowUnsort: false,
counts: [10, 25, 50, 100],
getData: params.getData,
getGroups: params.getGroups,
Expand All @@ -159,6 +160,7 @@ describe('ngTableParams', function () {
data: null,
total: 100,
defaultSort : 'desc',
allowUnsort: false,
counts: [10, 25, 50, 100],
getData: params.getData,
getGroups: params.getGroups,
Expand Down