summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-02-18 12:29:05 +0100
committerVincent Petry <pvince81@owncloud.com>2014-08-11 13:28:53 +0200
commit173059f6d00faa06dab9188efb2d7536f15861e4 (patch)
tree2d3efee8b0e682b16d33fb8a37e7f5567b696800 /settings/js
parent86ae3bd1e7d20e4f28ea9d7b9f71f1fdef0087aa (diff)
downloadnextcloud-server-173059f6d00faa06dab9188efb2d7536f15861e4.tar.gz
nextcloud-server-173059f6d00faa06dab9188efb2d7536f15861e4.zip
Fixed file list sorting
Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users/users.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 883851e2a2f..a94352e8e18 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -189,13 +189,15 @@ var UserList = {
var rows = $userListBody.find('tr').get();
rows.sort(function(a, b) {
+ // FIXME: inefficient way of getting the names,
+ // better use a data attribute
a = $(a).find('td.name').text();
b = $(b).find('td.name').text();
var firstSort = UserList.preSortSearchString(a, b);
if(typeof firstSort !== 'undefined') {
return firstSort;
}
- return UserList.alphanum(a, b);
+ return OC.Util.naturalSortCompare(a, b);
});
var items = [];