when connecting to a new connection setting the state of any existing connection to not-connected

Author: rmisio

css/obBase.css

@@ -4214,6 +4214,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 #ov1 .server-connect-modal .modal-child {
   height: 625px;
+  overflow: hidden;
 }
 
 #ov1 .server-connect-modal .message-bar {

js/router.js

@@ -145,6 +145,11 @@ module.exports = Backbone.Router.extend({
   },
 
   launchPageConnectModal: function(config) {
+    var defaults = {
+      connectText: 'Connecting...',
+      failedText: 'Unable to Connect.'
+    };
+
     if (!(
         config &&
         config.promise &&
@@ -153,11 +158,7 @@ module.exports = Backbone.Router.extend({
       throw new Error('At a minimum, the config must contain a config.promise.');
     }
 
-    var defaults = {
-      connectText: 'Connecting...',
-      failedText: 'Unable to Connect.'
-    };
-
+    $('#loadingModal').addClass('hide');
     config = __.extend({}, defaults, config);
 
     this.pageConnectModal && this.pageConnectModal.remove();

js/views/baseModal.js

@@ -34,7 +34,7 @@ module.exports = baseVw.extend({
     },
 
     __modalClick: function(e) {
-      if (e.target === this.el) {
+      if (this.__options.dismissOnOverlayClick && e.target === this.el) {
         this.close();
       }
     },

js/views/pageConnectModal.js

@@ -23,7 +23,6 @@ module.exports = baseModal.extend({
     this.options = options || {};
     this._state = {};
     this.setState(__.extend({}, defaultState, this.options.initialState || {}));
-    $('#loadingModal').addClass('hide'); //hide modal if it is still visible
   },
 
   setState: function(state) {

js/views/serverConnectModal.js

@@ -12,7 +12,7 @@ var __ = require('underscore'),
     ServerConfigsVw = require('./serverConfigsVw');
 
 module.exports = BaseModal.extend({
-  className: 'server-connect-modal',
+  className: 'server-connect-modal top0',
 
   events: {
     'click .js-close': 'closeConfigForm',
@@ -126,6 +126,8 @@ module.exports = BaseModal.extend({
 
     if (this.connectAttempt && this.connectAttempt.state() === 'pending') return this;
 
+    this.connectedServer = configMd;
+
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
       status: 'connected'
@@ -146,6 +148,7 @@ module.exports = BaseModal.extend({
     var msg;
 
     if (this.connectAttempt && this.connectAttempt.state() === 'pending') return this;
+    if (this.connectedServer && this.connectedServer.id === configMd.id) this.connectedServer = null;
 
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
@@ -178,6 +181,15 @@ module.exports = BaseModal.extend({
     this.connectAttempt && this.connectAttempt.cancel();
     this.hideMessageBar();
 
+    if (this.connectedServer) {
+      this.serverConfigsVw.setConnectionState({
+        id: this.connectedServer.id,
+        status: 'not-connected'
+      });
+
+      this.connectedServer = null;    
+    }
+
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
       status: 'connecting'
@@ -194,6 +206,8 @@ module.exports = BaseModal.extend({
       this.connectAttempt = null;
     });
 
+    this.connectAttempt.serverId = configMd.id;
+
     return this;
   },