summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-07 14:31:23 +0000
committerPhil Hughes <me@iamphill.com>2018-08-07 14:31:23 +0000
commitbf699ff49860aa186dc485a91f9b04081b346549 (patch)
treedcd57681538cb451baada340deed888c15d70de5 /app/assets/javascripts/vue_shared/components
parent37db21d6bc9ec624f1421588d7928e21c8b3072e (diff)
parentb8789b92f11cb90b3546b6a9ca5c78f2a6f614fb (diff)
downloadgitlab-ce-bf699ff49860aa186dc485a91f9b04081b346549.tar.gz
Merge branch 'kp-6927-epic-dates-from-milestone' into 'master'
Add `tabindex` attribute support on Icon component to show BS4 popover on trigger `focus` See merge request gitlab-org/gitlab-ce!21066
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-rw-r--r--app/assets/javascripts/vue_shared/components/icon.vue7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue
index e7ff76c8218..3cf90b45a97 100644
--- a/app/assets/javascripts/vue_shared/components/icon.vue
+++ b/app/assets/javascripts/vue_shared/components/icon.vue
@@ -75,6 +75,12 @@ export default {
required: false,
default: null,
},
+
+ tabIndex: {
+ type: String,
+ required: false,
+ default: null,
+ },
},
computed: {
@@ -98,6 +104,7 @@ export default {
:height="height"
:x="x"
:y="y"
+ :tabindex="tabIndex"
>
<use v-bind="{ 'xlink:href':spriteHref }"/>
</svg>