diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-18 16:13:57 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-18 16:13:57 +0000 |
| commit | f065decad106d4b30fa1844393813260f49f96c8 (patch) | |
| tree | ebf1080cfa51ffcaa89215fc15202ed213f96ecb | |
| parent | b272879377dd3a8eb788d02960cbb894704080f1 (diff) | |
| parent | 39e77651a272ce0aa61265d61e853d4e0cd19ac5 (diff) | |
| download | gitlab-ce-f065decad106d4b30fa1844393813260f49f96c8.tar.gz | |
Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master'
Hide tooltip manually
## What does this MR do?
Fixes an issue with tooltips not dissapearing on Firefox after toggling label priority
## What are the relevant issue numbers?
Closes #18707
## Screenshots (if relevant)
**Test on Firefox**
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4715
| -rw-r--r-- | app/assets/javascripts/LabelManager.js.coffee | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/LabelManager.js.coffee b/app/assets/javascripts/LabelManager.js.coffee index b06bcf0fcbf..6d8faba40d7 100644 --- a/app/assets/javascripts/LabelManager.js.coffee +++ b/app/assets/javascripts/LabelManager.js.coffee @@ -27,6 +27,11 @@ class @LabelManager $btn = $(e.currentTarget) $label = $("##{$btn.data('domId')}") action = if $btn.parents('.js-prioritized-labels').length then 'remove' else 'add' + + # Make sure tooltip will hide + $tooltip = $ "##{$btn.find('.has-tooltip:visible').attr('aria-describedby')}" + $tooltip.tooltip 'destroy' + _this.toggleLabelPriority($label, action) toggleLabelPriority: ($label, action, persistState = true) -> |