Reconnecting fix

diff --git a/client/src/models/application.js b/client/src/models/application.js
index 2318f47eed1c609a351d8ab3ad138456d344282a..43af0b4b26558e5d5d4a863b304da27bfdca0314 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -218,7 +218,8 @@
                 });\r
 \r
 \r
-                gw.on('connect', function (event) {\r
+                // After the socket has connected, kiwi handshakes and then triggers a kiwi:connected event\r
+                gw.on('kiwi:connected', function (event) {\r
                     that.view.$el.addClass('connected');\r
                     if (gw_stat !== 1) return;\r
 \r
@@ -229,6 +230,8 @@
 \r
                     // Mention the re-connection on every channel\r
                     _kiwi.app.connections.forEach(function(connection) {\r
+                        connection.reconnect();\r
+\r
                         connection.panels.server.addMsg('', styleText('rejoin', {text: msg}), 'action join');\r
 \r
                         connection.panels.forEach(function(panel) {\r

diff --git a/client/src/models/gateway.js b/client/src/models/gateway.js
index cd4baa97fca10d2f99dc78273c39b7cf6877448a..1de6fa4122ffc02af01686861ba85c2383cde63d 100644 (file)
--- a/client/src/models/gateway.js
+++ b/client/src/models/gateway.js
@@ -195,9 +195,6 @@ _kiwi.model.Gateway = function () {
     this.parseKiwi = function (command, data) {\r
         var args;\r
 \r
-        this.trigger('kiwi:' + command, data);\r
-        this.trigger('kiwi', data);\r
-\r
         switch (command) {\r
         case 'connected':\r
             // Send some info on this client to the server\r
@@ -211,6 +208,9 @@ _kiwi.model.Gateway = function () {
 \r
             break;\r
         }\r
+\r
+        this.trigger('kiwi:' + command, data);\r
+        this.trigger('kiwi', data);\r
     };\r
 \r
     /**\r