mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-26 19:26:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use natural sort in WebUI

Browse source
This commit is contained in:
Chocobo1 2022-08-26 16:36:41 +08:00
parent ca274635d5
commit d693f97a46
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
1 changed files with 20 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/webui/www/private/scripts/dynamicTable.js
View file

@ -54,6 +54,8 @@ window.qBittorrent.DynamicTable = (function() {
};
};
const naturalSortCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
let DynamicTableHeaderContextMenuClass = null;
let ProgressColumnWidth = -1;
@ -380,12 +382,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@ -2251,12 +2250,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@ -2348,12 +2344,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@ -2435,12 +2428,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@ -2523,12 +2513,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);
@ -2574,12 +2561,9 @@ window.qBittorrent.DynamicTable = (function() {
return row['full_data'][this.dataProperties[pos]];
};
column['compareRows'] = function(row1, row2) {
if (this.getRowValue(row1) < this.getRowValue(row2))
return -1;
else if (this.getRowValue(row1) > this.getRowValue(row2))
return 1;
else
return 0;
const value1 = this.getRowValue(row1);
const value2 = this.getRowValue(row2);
return naturalSortCollator.compare(value1, value2);
};
column['updateTd'] = function(td, row) {
const value = this.getRowValue(row);