fixed issue where Server Connect modal was not popping when the heartbeat socket goes down

Author: rmisio

js/Server.js

@@ -54,6 +54,7 @@ var Polyglot = require('node-polyglot'),
     startUpConnectMaxTime = 6 * 1000,
     startTime = Date.now(),
     startUpRetry,
+    removeStartupRetry,
     onActiveServerSync,
     extendPolyglot,
     newPageNavView,
@@ -391,7 +392,7 @@ launchOnboarding = function(guidCreating) {
 })()
 
 pageConnectModal.on('cancel', () => {
-  app.getHeartbeatSocket().off('close', startUpRetry);
+  removeStartupRetry();
   app.getHeartbeatSocket().close();
   pageConnectModal.remove();
   app.serverConnectModal.open();
@@ -409,7 +410,7 @@ app.serverConnectModal.on('connected', (authenticated) => {
 });
 
 app.getHeartbeatSocket().on('open', function(e) {
-  app.getHeartbeatSocket().off('close', startUpRetry);
+  removeStartupRetry();
   pageConnectModal.remove();
   $loadingModal.removeClass('hide');
   onboardingModal && onboardingModal.remove();
@@ -435,6 +436,14 @@ app.getHeartbeatSocket().on('close', (startUpRetry = function(e) {
   }
 }));
 
+removeStartupRetry = function() {
+  app.getHeartbeatSocket().off('close', startUpRetry);
+  app.getHeartbeatSocket().on('close', () => {
+    app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
+      .open();    
+  });
+};
+
 app.getHeartbeatSocket().on('message', function(e) {
   if (e.jsonData && e.jsonData.status) {
     switch (e.jsonData.status) {

js/main.js

@@ -81,6 +81,9 @@ module.exports = baseVw.extend({
       }
 
       // TODO: allow other options to be modifiable via this method.
+      // TODO: any options passed in here will be merged with existing ones,
+      // but what if you want to replace the options?? Perhaps this should
+      // replace and then we need a getModalOptions function?
     },
 
     remove: function() {

js/templates/serverConnectModalOLD.html

@@ -165,6 +165,7 @@ module.exports = BaseModal.extend({
     }
 
     reason !== 'canceled' && this.showMessageBar(msg);
+    this.setModalOptions({ showCloseButton: false });
 
     return this;
   },