additional tweaks

Author: rmisio

js/main.js

@@ -352,6 +352,7 @@ $(document).ajaxSend(function(e, jqXhr, settings) {
 });
 
 launchOnboarding = function(guidCreating) {
+  app.serverConnectModal.close();
   onboardingModal && onboardingModal.remove();
   onboardingModal = new OnboardingModal({
     model: user,
@@ -405,6 +406,7 @@ app.serverConnectModal.on('connected', (authenticated) => {
 app.getHeartbeatSocket().on('open', function(e) {
   app.getHeartbeatSocket().off('close', startUpRetry);
   pageConnectModal.remove();
+  $loadingModal.removeClass('hide');
   onboardingModal && onboardingModal.remove();
 
   // clear some flags so the heartbeat events will

js/views/serverConnectModal.js

@@ -42,7 +42,6 @@ module.exports = BaseModal.extend({
   },
 
   remove: function() {
-    $(document).off(null, this.onAjaxComplete);
     BaseModal.prototype.remove.apply(this, arguments);
   },
 
@@ -244,7 +243,7 @@ module.exports = BaseModal.extend({
       // check authentication
       loginRequest = app.login().done(function(data) {
         if (data.success) {
-          conclude(data);
+          conclude(false, data);
           self.trigger('connected', true);
         } else {
           if (data.reason === 'too many attempts') {
@@ -260,7 +259,6 @@ module.exports = BaseModal.extend({
 
         // assuming rest server is down or
         // wrong port set
-        // rejectLogin();
         conclude(true);
       });
     };