Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-26 15:41:17 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 16:43:36 +0300
commit4648d0016f67c9b780e3fff475e458fc28825daf (patch)
tree3e174cc75a2526b6c8a88ebedcccb416b6de8e04
parent5013f3a8167bb7c665b19f44ae66e543fe0b2fce (diff)
popover trigger needs to be defined in js init
According to https://github.com/twbs/bootstrap/issues/10547 it's not possible to have the trigger defined on the delegated element, i.e. not defined as a data attribute.
-rw-r--r--app/assets/javascripts/main.js3
-rw-r--r--app/helpers/commits_helper.rb1
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ecf7a677c99..d039ca9e47c 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -251,7 +251,8 @@ $(function () {
});
// Initialize popovers
$body.popover({
- selector: '[data-toggle="popover"]'
+ selector: '[data-toggle="popover"]',
+ trigger: 'focus'
});
$('.trigger-submit').on('change', function () {
return $(this).parents('form').submit();
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index e31baa52e99..42e9379d1f4 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -283,7 +283,6 @@ module CommitsHelper
toggle: 'popover',
html: 'true',
placement: 'auto bottom',
- trigger: 'focus',
title: title,
content: content
}