From 4b19d960d2e5705fced3ffbf9d0af203c6fa8e50 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Wed, 11 Jun 2014 15:36:19 +0900 Subject: [PATCH] Clear sorting now resets to initial sorting. --- .../device-list/device-list-details-controller.js | 14 ++++++++++---- res/app/device-list/device-list.jade | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/res/app/device-list/device-list-details-controller.js b/res/app/device-list/device-list-details-controller.js index bfbfe756..9547dbe2 100644 --- a/res/app/device-list/device-list-details-controller.js +++ b/res/app/device-list/device-list-details-controller.js @@ -7,7 +7,6 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ }) - $scope.statusFilter = function () { var def = $q.defer() var statuses = [ @@ -29,10 +28,17 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ // storeName: 'DeviceList.tableFilter' // }) - $scope.tableSorting = { - stateSorting: 'asc', // initial sorting - name: 'asc' // initial sorting + var initialSorting = { + stateSorting: 'asc', + name: 'asc' } + $scope.tableSorting = initialSorting + + $scope.clearSorting = function () { + $scope.tableParams.sorting(initialSorting) + $scope.tableParams.filter({}) + } + // SettingsService.bind($scope, { // key: 'tableSorting', // storeName: 'DeviceList.tableSorting' diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade index 50758a04..8876a307 100644 --- a/res/app/device-list/device-list.jade +++ b/res/app/device-list/device-list.jade @@ -59,7 +59,7 @@ div.stf-device-list nothing-to-show(message='{{"No devices connected"|translate}}', icon='fa-sitemap', ng-show='!tracker.devices.length') .filtering-buttons - clear-button(ng-click="tableParams.sorting({}); tableParams.filter({})") + clear-button(ng-click="clearSorting()") filter-button(ng-model='filterEnabled') .button-spacer.pull-right button(btn-checkbox, ng-model='showAll').btn.btn-sm.btn-primary-outline.pull-right