final tweaks to page nav server menu

Author: rmisio

css/obBase.css

@@ -4309,7 +4309,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   opacity: 0;
 }
 
-#ov1 .server-config-form:not('.no-transition') {
+#ov1 .server-config-form:not(.no-transition) {
   transition: top 250ms;
 }
 

js/views/pageNavVw.js

@@ -295,6 +295,7 @@ module.exports = baseVw.extend({
       self.addressInput = self.$el.find('.js-navAddressBar');
       self.statusBar = self.$el.find('.js-navStatusBar');
       self.serverSubmenu = self.$('.js-serverSubmenu');
+      self.serverSubmenuTrigger = self.$('.js-serverSubmenuTrigger');
 
       //listen for address bar set events
       self.listenTo(window.obEventBus, "setAddressBar", function(options){
@@ -487,7 +488,17 @@ module.exports = baseVw.extend({
     }
   },
 
-  closeNav: function() {
+  closeNav: function(e) {
+    if (
+      e &&
+      (
+        e.target === this.serverSubmenuTrigger[0] ||
+        $(e.target).parents('.js-serverSubmenuTrigger').length
+      )
+    ) {
+      return;
+    }    
+
     app.hideOverlay();
     self.$('.js-navProfileMenu').removeClass('popMenu-opened');
     clearTimeout(this.ServerSubmenuTimeout);

js/views/serverConnectModal.js

@@ -54,6 +54,8 @@ module.exports = BaseModal.extend({
   },  
 
   closeConfigForm: function() {
+    var disp;
+
     if (!this.$jsConfigFormWrap) return;
 
     this.$jsConfigFormWrap.addClass('slide-out');
@@ -63,6 +65,22 @@ module.exports = BaseModal.extend({
       showNew: true
     });
 
+    setTimeout(() => {
+      if (this.isOpen()) {
+        // for some reason, when launching the modal and immediatally
+        // opening the config, a subsequent close doesn't position it
+        // properly unless we force a redraw (at least on Mac chrome).
+        this.$jsConfigFormWrap.one('transitionend', () => {
+          disp = this.$jsConfigFormWrap[0].style.display;
+          this.$jsConfigFormWrap[0].style.display = 'none';
+      
+          setTimeout(() => {
+            this.$jsConfigFormWrap[0].style.display = disp;
+          }, 100);      
+        });
+      }
+    }, 0);
+
     return this;
   },  
 
@@ -98,9 +116,19 @@ module.exports = BaseModal.extend({
       this.connect(md);
     });
 
-    this.$jsConfigFormWrap.one('transitionend', () => {
-      this.serverConfigFormVw.$('input[name="name"]').focus();
-    }).removeClass(`slide-out ${!this.isOpen() ? 'no-transition' : ''}`);    
+    if (this.isOpen()) {
+      this.$jsConfigFormWrap.one('transitionend', () => {
+        this.serverConfigFormVw.$('input[name="name"]').focus();
+      }).removeClass('slide-out');
+    } else {
+      this.$jsConfigFormWrap.addClass('no-transition')
+        .removeClass('slide-out');
+
+      setTimeout(() => {
+        this.serverConfigFormVw.$('input[name="name"]').focus();
+        this.$jsConfigFormWrap.removeClass('no-transition');
+      }, 0);      
+    }
 
     return this;
   },