From ab1e37480e2ae852b0b677e4080ee6ed0a79bca1 Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Mon, 4 Aug 2014 16:52:33 +0100
Subject: [PATCH] Client reconnection notification cleanup + fixes

---
 client/src/models/application.js | 59 ++++++++++++--------------------
 client/src/models/network.js     |  7 +++-
 client/src/views/tabs.js         |  6 ++++
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/client/src/models/application.js b/client/src/models/application.js
index 7b4f971..b81b109 100644
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -184,37 +184,16 @@
                 // 0 = non-reconnecting state. 1 = reconnecting state.
                 var gw_stat = 0;
 
-                // If the current or upcoming disconnect was planned
-                var unplanned_disconnect = false;
-
                 gw.on('disconnect', function (event) {
-                    unplanned_disconnect = !gw.disconnect_requested;
-
-                    if (unplanned_disconnect) {
-                        var msg = _kiwi.global.i18n.translate('client_models_application_reconnecting').fetch() + '...';
-                        that.message.text(msg, {timeout: 10000});
-                    }
-
                     that.view.$el.removeClass('connected');
 
-                    // Mention the disconnection on every channel
-                    _kiwi.app.connections.forEach(function(connection) {
-                        connection.panels.server.addMsg('', styleText('quit', {text: msg}), 'action quit');
-
-                        connection.panels.forEach(function(panel) {
-                            if (!panel.isChannel())
-                                return;
-
-                            panel.addMsg('', styleText('quit', {text: msg}), 'action quit');
-                        });
-                    });
-
+                    // Reconnection phase will start to kick in
                     gw_stat = 1;
                 });
 
 
                 gw.on('reconnecting', function (event) {
-                    var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_in_x_seconds').fetch(event.delay/1000) + '...';
+                    var msg = translateText('client_models_application_reconnect_in_x_seconds', [event.delay/1000]) + '...';
 
                     // Only need to mention the repeating re-connection messages on server panels
                     _kiwi.app.connections.forEach(function(connection) {
@@ -225,29 +204,34 @@
 
                 // After the socket has connected, kiwi handshakes and then triggers a kiwi:connected event
                 gw.on('kiwi:connected', function (event) {
+                    var msg;
+
                     that.view.$el.addClass('connected');
-                    if (gw_stat !== 1) return;
 
-                    if (unplanned_disconnect) {
-                        var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_successfully').fetch() + ':)';
+                    // If we were reconnecting, show some messages we have connected back OK
+                    if (gw_stat === 1) {
+
+                        // No longer in the reconnection state
+                        gw_stat = 0;
+
+                        msg = translateText('client_models_application_reconnect_successfully') + ' :)';
                         that.message.text(msg, {timeout: 5000});
-                    }
 
-                    // Mention the re-connection on every channel
-                    _kiwi.app.connections.forEach(function(connection) {
-                        connection.reconnect();
+                        // Mention the re-connection on every channel
+                        _kiwi.app.connections.forEach(function(connection) {
+                            connection.reconnect();
 
-                        connection.panels.server.addMsg('', styleText('rejoin', {text: msg}), 'action join');
+                            connection.panels.server.addMsg('', styleText('rejoin', {text: msg}), 'action join');
 
-                        connection.panels.forEach(function(panel) {
-                            if (!panel.isChannel())
-                                return;
+                            connection.panels.forEach(function(panel) {
+                                if (!panel.isChannel())
+                                    return;
 
-                            panel.addMsg('', styleText('rejoin', {text: msg}), 'action join');
+                                panel.addMsg('', styleText('rejoin', {text: msg}), 'action join');
+                            });
                         });
-                    });
+                    }
 
-                    gw_stat = 0;
                 });
             })();
 
@@ -276,6 +260,7 @@
                 if (data.force) {
                     // Get an interval between 5 and 6 minutes so everyone doesn't reconnect it all at once
                     var jump_server_interval = Math.random() * (360 - 300) + 300;
+                    jump_server_interval = 1;
 
                     // Tell the user we are going to disconnect, wait 5 minutes then do the actual reconnect
                     var msg = _kiwi.global.i18n.translate('client_models_application_jumpserver_prepare').fetch();
diff --git a/client/src/models/network.js b/client/src/models/network.js
index 0fb5fa7..df8ac53 100644
--- a/client/src/models/network.js
+++ b/client/src/models/network.js
@@ -101,6 +101,11 @@
                     that.gateway = _kiwi.global.components.Network(that.get('connection_id'));
                     that.bindGatewayEvents();
 
+                    // Reset each of the panels connection ID
+                    that.panels.forEach(function(panel) {
+                        panel.set('connection_id', connection_id);
+                    });
+
                     callback_fn && callback_fn(err);
 
                 } else {
@@ -246,7 +251,7 @@
                 query = new _kiwi.model.Query({name: nick});
                 that.panels.add(query);
             }
-            
+
             // In all cases, show the demanded query
             query.view.show();
         }
diff --git a/client/src/views/tabs.js b/client/src/views/tabs.js
index 1830701..fc81b42 100644
--- a/client/src/views/tabs.js
+++ b/client/src/views/tabs.js
@@ -24,6 +24,12 @@ _kiwi.view.Tabs = Backbone.View.extend({
             this.model.network.on('change:name', function (network, new_val) {
                 $('span', this.model.server.tab).text(new_val);
             }, this);
+
+            this.model.network.on('change:connection_id', function (network, new_val) {
+                this.model.forEach(function(panel) {
+                    panel.tab.data('connection_id', new_val);
+                });
+            }, this);
         }
     },
 
-- 
2.25.1