Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-network: fix sort operations

Browse source 
Ensure to return [-1, 0, 1] from the sort callback instead of [0, 1]
which fails in non-FF browsers.

Fixes: #5859
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2022-07-08 16:03:14 +02:00
parent e1932592c3
commit 3a6f37f9df
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
View file

@ -13,6 +13,16 @@
var isReadonlyView = !L.hasViewPermission() || null; var isReadonlyView = !L.hasViewPermission() || null;
function strcmp(a, b) {
if (a < b)
return -1;
if (a > b)
return 1;
return 0;
}
function count_changes(section_id) { function count_changes(section_id) {
var changes = ui.changes.changes, n = 0; var changes = ui.changes.changes, n = 0;
@ -535,7 +545,7 @@ return view.extend({
var protocols = network.getProtocols(); var protocols = network.getProtocols();
protocols.sort(function(a, b) { protocols.sort(function(a, b) {
return a.getProtocol() > b.getProtocol(); return strcmp(a.getProtocol(), b.getProtocol());
}); });
o = s.taboption('general', form.DummyValue, '_ifacestat_modal', _('Status')); o = s.taboption('general', form.DummyValue, '_ifacestat_modal', _('Status'));
@ -1253,7 +1263,7 @@ return view.extend({
s.cfgsections = function() { s.cfgsections = function() {
var sections = uci.sections('network', 'device'), var sections = uci.sections('network', 'device'),
section_ids = sections.sort(function(a, b) { return a.name > b.name }).map(function(s) { return s['.name'] }); section_ids = sections.sort(function(a, b) { return strcmp(a.name, b.name) }).map(function(s) { return s['.name'] });
for (var i = 0; i < netDevs.length; i++) { for (var i = 0; i < netDevs.length; i++) {
if (sections.filter(function(s) { return s.name == netDevs[i].getName() }).length) if (sections.filter(function(s) { return s.name == netDevs[i].getName() }).length)