From 8f4aa5511bc32d5c5e4e74c3ae8957817b145bfb Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 8 Oct 2018 14:06:10 -0400 Subject: [PATCH] update side nav settings pane show hide hover logic --- .../lib/components/layout/side-nav-item.directive.js | 2 +- .../client/lib/components/layout/side-nav.directive.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/lib/components/layout/side-nav-item.directive.js b/awx/ui/client/lib/components/layout/side-nav-item.directive.js index 4cccabe8fc..1189f513d8 100644 --- a/awx/ui/client/lib/components/layout/side-nav-item.directive.js +++ b/awx/ui/client/lib/components/layout/side-nav-item.directive.js @@ -8,8 +8,8 @@ function atSideNavItemLink (scope, element, attrs, ctrl) { scope.navVm.onSettingsNavItem = true; scope.navVm.showSettingsSubMenu = true; }, () => { + scope.navVm.onSettingsNavItem = false; setTimeout(() => { - scope.navVm.onSettingsNavItem = false; if (!scope.navVm.onSettingsSubPane) { scope.navVm.showSettingsSubMenu = false; } diff --git a/awx/ui/client/lib/components/layout/side-nav.directive.js b/awx/ui/client/lib/components/layout/side-nav.directive.js index 81e3b63dd7..40950152d5 100644 --- a/awx/ui/client/lib/components/layout/side-nav.directive.js +++ b/awx/ui/client/lib/components/layout/side-nav.directive.js @@ -14,10 +14,12 @@ function atSideNavLink (scope, element, attrs, ctrl) { element.find('.at-SettingsSubPane').hover(() => { scope.vm.onSettingsSubPane = true; }, () => { - if (!scope.vm.onSettingsNavItem) { - scope.vm.onSettingsSubPane = false; - scope.vm.showSettingsSubMenu = false; - } + scope.vm.onSettingsSubPane = false; + setTimeout(() => { + if (!scope.vm.onSettingsNavItem) { + scope.vm.showSettingsSubMenu = false; + } + }, 100); }); }