diff options
Diffstat (limited to 'modules/luci-mod-network')
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js index f02b254645..194b2a3df9 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js @@ -89,6 +89,7 @@ function render_network_status(radioNet) { channel = radioNet.getChannel(), disabled = (radioNet.get('disabled') == '1' || uci.get('wireless', radioNet.getWifiDeviceName(), 'disabled') == '1'), is_assoc = (bssid && bssid != '00:00:00:00:00:00' && channel && mode != 'Unknown' && !disabled), + is_mesh = (radioNet.getMode() == 'mesh'), changecount = count_changes(radioNet.getName()), status_text = null; @@ -101,7 +102,7 @@ function render_network_status(radioNet) { status_text = E('em', disabled ? _('Wireless is disabled') : _('Wireless is not associated')); return L.itemlist(E('div'), [ - _('SSID'), radioNet.getSSID() || '?', + is_mesh ? _('Mesh ID') : _('SSID'), (is_mesh ? radioNet.getMeshID() : radioNet.getSSID()) || '?', _('Mode'), mode, _('BSSID'), (!changecount && is_assoc) ? bssid : null, _('Encryption'), (!changecount && is_assoc) ? radioNet.getActiveEncryption() || _('None') : null, @@ -225,7 +226,7 @@ var CBIWifiFrequencyValue = form.Value.extend({ '11a': L.hasSystemFeature('hostapd', 'acs') ? [ 'auto', 'auto', true ] : [] }; - for (var i = 0; Array.isArray(data[1]) && i < data[1].length; i++) + for (var i = 0; i < data[1].length; i++) this.channels[(data[1][i].mhz > 2484) ? '11a' : '11g'].push( data[1][i].channel, '%d (%d Mhz)'.format(data[1][i].channel, data[1][i].mhz), @@ -285,7 +286,7 @@ var CBIWifiFrequencyValue = form.Value.extend({ if (vals[i+2]) sel.add(E('option', { value: vals[i+0] }, [ vals[i+1] ])); - if (!isNaN(vals.selected)) + if (vals && !isNaN(vals.selected)) sel.selectedIndex = vals.selected; sel.parentNode.style.display = (sel.options.length <= 1) ? 'none' : ''; @@ -482,7 +483,7 @@ var CBIWifiCountryValue = form.Value.extend({ }, renderWidget: function(section_id, option_index, cfgvalue) { - var typeClass = this.keylist.length ? form.ListValue : form.Value; + var typeClass = (this.keylist && this.keylist.length) ? form.ListValue : form.Value; return typeClass.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]); } }); |