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 61db90e) https://bugzilla.redhat.com/show_bug.cgi?id=1536684
ManageIQ · Mar 6, 2018 · 0dde1bb · 0dde1bb
1 parent 431e11a
commit 0dde1bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -1,10 +1,10 @@
-<span class="primary-action pull-left" uib-dropdown>
+<span class="primary-action pull-left" uib-dropdown is-open="vm.isOpen">
   <button type="button" class="btn btn-default" uib-dropdown-toggle ng-disabled="vm.config.isDisabled"
    uib-tooltip="{{vm.config.tooltipText}}"
             tooltip-append-to-body="true"
             tooltip-popup-delay="1000"
             tooltip-placement="top"
-            tooltip-enable="vm.config.tooltipText"
+            tooltip-enable="!vm.isOpen && vm.config.tooltipText"
     >
     <i class="{{vm.config.icon}}"></i>
     <span ng-if="vm.config.title">{{vm.config.title}}</span>