Kouhei Sutou
null+****@clear*****
Fri Nov 7 17:52:57 JST 2014
Kouhei Sutou 2014-11-07 17:52:57 +0900 (Fri, 07 Nov 2014) New Revision: 3aed060e523400b81fcf9102f0721f42e96ced4d https://github.com/groonga/groonga-admin/commit/3aed060e523400b81fcf9102f0721f42e96ced4d Message: Extract as a function Modified files: app/scripts/controllers/table-search-controller.js Modified: app/scripts/controllers/table-search-controller.js (+14 -9) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-07 17:52:46 +0900 (6340f73) +++ app/scripts/controllers/table-search-controller.js 2014-11-07 17:52:57 +0900 (ae0110f) @@ -48,6 +48,17 @@ angular.module('groongaAdminApp') return names.join(','); } + function packSortColumns(columns) { + var keys = columns.map(function(column) { + if (column.sort === 'ascending') { + return column.name; + } else { + return '-' + column.name; + } + }); + keys.join(','); + } + function search() { var parameters = angular.copy($scope.parameters); @@ -64,16 +75,10 @@ angular.module('groongaAdminApp') parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; parameters.limit = $scope.nRecordsInPage; - var sortKeys = $scope.columns.filter(function(column) { + var sortColumns = $scope.columns.filter(function(column) { return column.sort; - }).map(function(column) { - if (column.sort === 'ascending') { - return column.name; - } else { - return '-' + column.name; - } - }).join(','); - parameters.sortby = sortKeys; + }); + parameters.sortby = packSortColumns(sortColumns); $location.search(parameters); } -------------- next part -------------- HTML����������������������������...Download
