From cf3d97594b35e321b6dffd3d808bd6fa5d57f2fb Mon Sep 17 00:00:00 2001 From: Darren Date: Wed, 5 Jun 2013 13:58:38 +0100 Subject: [PATCH] Do not re-join closed auto-joined channels on reconnect --- client/assets/src/models/network.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js index d8ea772..92f49a5 100644 --- a/client/assets/src/models/network.js +++ b/client/assets/src/models/network.js @@ -174,6 +174,8 @@ // Show the last channel if we have one if (panels) panels[panels.length - 1].view.show(); + + delete this.auto_join; } } @@ -403,7 +405,7 @@ panel.addMsg('[' + (event.nick||'') + ']', event.msg); // Show this notice to the active panel if it didn't have a set target - if (!event.from_server && panel === this.panels.server && !this.panels.server.isActive()) + if (!event.from_server && panel === this.panels.server) _kiwi.app.panels().active.addMsg('[' + (event.nick||'') + ']', event.msg); } @@ -675,27 +677,16 @@ break; case 'nickname_in_use': this.panels.server.addMsg(' ', '== The nickname ' + event.nick + ' is already in use. Please select a new nickname', 'status'); - if (this.panels.server !== this.panels.active) { + if (this.panels.server !== thia.panels.active) { _kiwi.app.message.text('The nickname "' + event.nick + '" is already in use. Please select a new nickname'); } // Only show the nickchange component if the controlbox is open - if (_kiwi.app.controlbox.$el.css('display') !== 'none') { + if (that.controlbox.$el.css('display') !== 'none') { (new _kiwi.view.NickChangeBox()).render(); } break; - case 'erroneus_nickname': - this.panels.server.addMsg(' ', '== The nickname ' + event.nick + ' is not valid for this network. Please select a new nickname', 'status'); - if (this.panels.server !== this.panels.active) { - _kiwi.app.message.text('The nickname "' + event.nick + '" is not valid for this network. Please select a new nickname'); - } - - // Only show the nickchange component if the controlbox is open - if (_kiwi.app.controlbox.$el.css('display') !== 'none') { - (new _kiwi.view.NickChangeBox()).render(); - } - break; case 'password_mismatch': this.panels.server.addMsg(' ', '== Incorrect password given', 'status'); -- 2.25.1