squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-17 14:08:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use natural sort

Browse Source
This commit is contained in:
Chocobo1
2023-06-02 17:43:56 +08:00
parent b1492bcd7d
commit 5cea69472f
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/webui/www/private/scripts/dynamicTable.js
View File

@@ -57,8 +57,6 @@ window.qBittorrent.DynamicTable = (function() {
};
};
const naturalSortCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
const compareNumbers = (val1, val2) => {
if (val1 < val2)
return -1;
@@ -412,7 +410,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@@ -2705,7 +2703,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@@ -2801,7 +2799,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@@ -2887,7 +2885,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@@ -2974,7 +2972,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@@ -3024,7 +3022,7 @@ window.qBittorrent.DynamicTable = (function() {
const value2 = this.getRowValue(row2);
if ((typeof(value1) === 'number') && (typeof(value2) === 'number'))
return compareNumbers(value1, value2);
return naturalSortCollator.compare(value1, value2);
return window.qBittorrent.Misc.naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);