From 0dde1bb5dffec799ff3c76c882ec2390a05ec9f3 Mon Sep 17 00:00:00 2001 From: Allen Wight Date: Fri, 15 Dec 2017 15:54:02 -0500 Subject: [PATCH] Merge pull request #1345 from chalettu/menu-tooltip-issue BZ#1518056-Ensured tooltips do not show when drop downs are open (cherry picked from commit 61db90ef9f07dd33ba1ce6a00f43af8e90788e32) https://bugzilla.redhat.com/show_bug.cgi?id=1536684 --- .../app/shared/custom-dropdown/custom-dropdown.component.js | 2 +- client/app/shared/custom-dropdown/custom-dropdown.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/app/shared/custom-dropdown/custom-dropdown.component.js b/client/app/shared/custom-dropdown/custom-dropdown.component.js index da53e196a..26d09ff1e 100644 --- a/client/app/shared/custom-dropdown/custom-dropdown.component.js +++ b/client/app/shared/custom-dropdown/custom-dropdown.component.js @@ -20,9 +20,9 @@ function ComponentController() { vm.$onInit = function() { vm.menuRight = vm.menuRight && (vm.menuRight === 'true' || vm.menuRight === true); - angular.extend(vm, { handleAction: handleAction, + isOpen: false }); }; diff --git a/client/app/shared/custom-dropdown/custom-dropdown.html b/client/app/shared/custom-dropdown/custom-dropdown.html index 3ecdf28a5..29e5b1ed2 100644 --- a/client/app/shared/custom-dropdown/custom-dropdown.html +++ b/client/app/shared/custom-dropdown/custom-dropdown.html @@ -1,10 +1,10 @@ - +