d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use natural sort in WebUI

adaptive-webui-19844
Chocobo1 2 years ago
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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/webui/www/private/scripts/dynamicTable.js

56
src/webui/www/private/scripts/dynamicTable.js
Unescape View File

@ -54,6 +54,8 @@ window.qBittorrent.DynamicTable = (function() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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);

Write Preview
Loading…
Cancel
Save