mirror of
https://github.com/openwrt/luci.git
synced 2026-05-31 02:21:50 +08:00
luci-mod-dashboard: correctness fixes
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
This commit is contained in:
+1
-3
@@ -116,9 +116,7 @@ return baseclass.extend({
|
||||
if ('addrsv4' === ver) {
|
||||
const addrs = data[idx][ver].value;
|
||||
if(Array.isArray(addrs) && addrs.length) {
|
||||
for(let ip in addrs) {
|
||||
data[idx][ver].value = addrs[ip].split('/')[0];
|
||||
}
|
||||
data[idx][ver].value = addrs.map(a => a.split('/')[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -20,7 +20,7 @@ return baseclass.extend({
|
||||
|
||||
for (let i = 0; i < radios_networks_hints[1].length; i++)
|
||||
tasks.push(L.resolveDefault(radios_networks_hints[1][i].getAssocList(), []).then(L.bind((net, list) => {
|
||||
net.assoclist = list.sort((a, b) => { return a.mac > b.mac });
|
||||
net.assoclist = list.sort((a, b) => a.mac.localeCompare(b.mac));
|
||||
}, this, radios_networks_hints[1][i])));
|
||||
|
||||
return Promise.all(tasks).then(() => {
|
||||
@@ -138,7 +138,7 @@ return baseclass.extend({
|
||||
|
||||
renderUpdateData(radios, networks, hosthints) {
|
||||
|
||||
for (let i = 0; i < radios.sort((a, b) => { a.getName() > b.getName() }).length; i++) {
|
||||
for (let i = 0; i < radios.sort((a, b) => a.getName().localeCompare(b.getName())).length; i++) {
|
||||
const network_items = networks.filter(net => { return net.getWifiDeviceName() == radios[i].getName() });
|
||||
|
||||
for (let j = 0; j < network_items.length; j++) {
|
||||
|
||||
@@ -17,9 +17,9 @@ function invokeIncludesLoad(includes) {
|
||||
|
||||
for (let i = 0; i < includes.length; i++) {
|
||||
if (typeof(includes[i].load) == 'function') {
|
||||
tasks.push(includes[i].load().catch(L.bind(() => {
|
||||
tasks.push(includes[i].load().catch(function() {
|
||||
this.failed = true;
|
||||
}, includes[i])));
|
||||
}.bind(includes[i])));
|
||||
|
||||
has_load = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user