diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-11-01 17:23:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-01 17:23:17 +0100 |
| commit | 78645e7efe0e039e7a69c868561a395f010d7523 (patch) | |
| tree | a4e7f9ba9c39c676ca384b4a56aa3b95970204b1 /modules | |
| parent | 45da0395a024bf3b27a74ed6ec0f0c66be8ff1a3 (diff) | |
| parent | ba98a2fd0500a4f94680240255ae8c8034fea850 (diff) | |
Merge pull request #4561 from Ansuel/fix-enc-ap
Fix one display bug for ap join and #4524
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js | 8 |
1 files changed, 4 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 fff9862fb..6a55a8fd5 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 @@ -1742,7 +1742,7 @@ return view.extend({ E('span', { 'style': s }, '%h'.format(network.formatWifiEncryption(res.encryption))), E('div', { 'class': 'right' }, E('button', { 'class': 'cbi-button cbi-button-action important', - 'click': L.bind(this.handleJoin, this, radioDev, res) + 'click': ui.createHandlerFn(this, 'handleJoin', radioDev, res) }, _('Join Network'))) ]); @@ -1841,11 +1841,11 @@ return view.extend({ uci.set('wireless', section_id, 'bssid', bss.bssid); } - if (is_sae) { + if (is_sae.length > 0) { uci.set('wireless', section_id, 'encryption', 'sae'); uci.set('wireless', section_id, 'key', passval); } - else if (is_psk) { + else if (is_psk.length > 0) { for (var i = enc.wpa.length - 1; i >= 0; i--) { if (enc.wpa[i] == 2) { uci.set('wireless', section_id, 'encryption', 'psk2'); @@ -1886,7 +1886,7 @@ return view.extend({ }; s.handleJoin = function(radioDev, bss, ev) { - this.handleScanAbort(ev); + poll.remove(this.pollFn); var m2 = new form.Map('wireless'), s2 = m2.section(form.NamedSection, '_new_'), |