diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-16 09:44:55 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-16 09:44:55 +0000 |
| commit | eb0787fdbaf7afc182ed5138950ef83a5295d12f (patch) | |
| tree | af74c4a45aa047be00e1d804ecd5194f4b506076 | |
| parent | a4176e7fe6377a9a6df106e6e6093036611f142f (diff) | |
| parent | ea8107768d17752a12b834585a62553f96542738 (diff) | |
| download | gitlab-ce-eb0787fdbaf7afc182ed5138950ef83a5295d12f.tar.gz | |
Merge branch 'diff-comments-toggle-tooltip-hide' into 'master'
Hides tooltip on discussion toggle button when clicking
## What does this MR do?
Hides the tooltip when clicking the discussion toggle button.
Rather than triggering the tooltip to hide we trigger blur. This is because of how _amazing_ Bootstraps tooltips are. They are shown also on focus so if we trigger the tooltip to hide & then mouseover the button again the tooltip still shows.
## What are the relevant issue numbers?
Closes #20750
See merge request !6303
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 54a5f32932d..7f144628d61 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,7 @@ v 8.12.0 (unreleased) - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps) - Request only the LDAP attributes we need !6187 - Center build stage columns in pipeline overview (ClemMakesApps) + - Fix bug with tooltip not hiding on discussion toggle button - Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps) - Fix bug stopping issue description being scrollable after selecting issue template - Remove suggested colors hover underline (ClemMakesApps) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 31fa508d6c1..c029bf3b5ca 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -251,6 +251,7 @@ } else { notesHolders.hide(); } + $this.trigger('blur'); return e.preventDefault(); }); $document.off("click", '.js-confirm-danger'); |