From: Darren <darren@darrenwhitlen.com>
Date: Fri, 31 Aug 2012 21:43:20 +0000 (+0100)
Subject: Auto-joining to specificed channel
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=99e0111ec44676b6a69d382799a827e0d7e518ea;p=KiwiIRC.git

Auto-joining to specificed channel
---

diff --git a/client_backbone/model_application.js b/client_backbone/model_application.js
index b53e192..80c1521 100644
--- a/client_backbone/model_application.js
+++ b/client_backbone/model_application.js
@@ -1,6 +1,9 @@
 kiwi.model.Application = Backbone.Model.extend(new (function () {
     var that = this;
 
+    // The auto connect details entered into the server select box
+    var auto_connect_details = {};
+
     /** Instance of kiwi.model.PanelList */
     this.panels = null;
 
@@ -18,10 +21,10 @@ kiwi.model.Application = Backbone.Model.extend(new (function () {
         this.panels.server.server_login.on('server_connect', function (event) {
             var form = this;
 
+            auto_connect_details = event;
+
             kiwi.gateway.set('nick', event.nick);
-            kiwi.gateway.connect(event.server, 6667, false, false, function () {
-                that.view.barsShow();
-            });
+            kiwi.gateway.connect(event.server, 6667, false, false, function () {});
         });
 
     };
@@ -60,7 +63,13 @@ kiwi.model.Application = Backbone.Model.extend(new (function () {
         });
 
 
-        gw.on('onconnect', function (event) {});
+        gw.on('onconnect', function (event) {
+            that.view.barsShow();
+            
+            if (auto_connect_details.channel) {
+                kiwi.gateway.join(auto_connect_details.channel);
+            }
+        });
 
 
         gw.on('onjoin', function (event) {