From: Jo-Philipp Wich <redacted>
Date: Tue, 9 Feb 2021 23:02:59 +0000 (+0100)
Subject: luci-base: luci.js: fix sortedKeys() ordering
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3c166c25de535c5c5aeda1d40eba6c1756c412be;p=openwrt-luci.git

luci-base: luci.js: fix sortedKeys() ordering

Chrome does not properly sort arrays when the sort function returns boolean
results, in contrast to Firefox which does.

Fix the issue by returning a numerical result instead.

Fixes: #4792
Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 936630a79d..23853e2cc8 100644
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -2972,7 +2972,12 @@
 			}).filter(function(e) {
 				return (e[1] != null);
 			}).sort(function(a, b) {
-				return (a[1] > b[1]);
+				if (a[1] < b[1])
+					return -1;
+				else if (a[1] > b[1])
+					return 1;
+				else
+					return 0;
 			}).map(function(e) {
 				return e[0];
 			});