Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BZ#1518056-Ensured tooltips do not show when drop downs are open #1345

Merged
merged 1 commit into from
Dec 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ function ComponentController () {

vm.$onInit = function () {
vm.menuRight = vm.menuRight && (vm.menuRight === 'true' || vm.menuRight === true)

angular.extend(vm, {
handleAction: handleAction
handleAction: handleAction,
isOpen: false
})
}

Expand Down
4 changes: 2 additions & 2 deletions client/app/shared/custom-dropdown/custom-dropdown.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down