Merge pull request #4561 from Ansuel/fix-enc-ap

Fix one display bug for ap join and #4524

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 fff9862fbaa2f76875829956d4fd2efe75cac420..6a55a8fd5de08201d35a3f4ae8fc7654ea1673df 100644 (file)
--- 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_'),