summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared
diff options
context:
space:
mode:
authorJan Beckmann <king-jan1999@hotmail.de>2018-10-02 13:59:42 +0000
committerPhil Hughes <me@iamphill.com>2018-10-02 13:59:42 +0000
commitceafbbd317c9b9e67be6a1a223ab3f893ae047b3 (patch)
tree88d41f541dbf2c8d04ef4a1bdb866c6906bbbc26 /app/assets/javascripts/vue_shared
parent57dc233325727a0baf28492bf59ae4b67562b84d (diff)
downloadgitlab-ce-ceafbbd317c9b9e67be6a1a223ab3f893ae047b3.tar.gz
Resolve "Add "Link" shortcut/icon in markdown editor to make it easier to add references"
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/header.vue6
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue6
2 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 8c22f3f6536..afc4196c729 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -106,6 +106,12 @@
icon="code"
/>
<toolbar-button
+ tag="[{text}](url)"
+ tag-select="url"
+ button-title="Add a link"
+ icon="link"
+ />
+ <toolbar-button
:prepend="true"
tag="* "
button-title="Add a bullet list"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
index 9f1e009efdd..bda33636369 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
@@ -27,6 +27,11 @@
required: false,
default: '',
},
+ tagSelect: {
+ type: String,
+ required: false,
+ default: '',
+ },
prepend: {
type: Boolean,
required: false,
@@ -40,6 +45,7 @@
<button
v-tooltip
:data-md-tag="tag"
+ :data-md-select="tagSelect"
:data-md-block="tagBlock"
:data-md-prepend="prepend"
:title="buttonTitle"