summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/issue_show/components/description.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-15 12:28:42 +0100
committerPhil Hughes <me@iamphill.com>2017-05-15 12:28:42 +0100
commit96a46521002f17aff2fc09f02778432ae049c6ee (patch)
tree28358860f521935fde18506575d682dc27577718 /app/assets/javascripts/issue_show/components/description.vue
parentaa6d92aedb61bdc9f5c1edec95dfe3f938a4d08f (diff)
downloadgitlab-ce-96a46521002f17aff2fc09f02778432ae049c6ee.tar.gz
Added markdown docs link
[ci skip]
Diffstat (limited to 'app/assets/javascripts/issue_show/components/description.vue')
-rw-r--r--app/assets/javascripts/issue_show/components/description.vue38
1 files changed, 21 insertions, 17 deletions
diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue
index b7a0a1bf7e4..fb542c70489 100644
--- a/app/assets/javascripts/issue_show/components/description.vue
+++ b/app/assets/javascripts/issue_show/components/description.vue
@@ -9,22 +9,6 @@
type: Boolean,
required: true,
},
- descriptionHtml: {
- type: String,
- required: true,
- },
- descriptionText: {
- type: String,
- required: true,
- },
- updatedAt: {
- type: String,
- required: true,
- },
- taskStatus: {
- type: String,
- required: true,
- },
store: {
type: Object,
required: true,
@@ -37,14 +21,33 @@
type: String,
required: true,
},
+ markdownDocs: {
+ type: String,
+ required: true,
+ },
},
data() {
return {
+ state: this.store.state,
preAnimation: false,
pulseAnimation: false,
timeAgoEl: $('.js-issue-edited-ago'),
};
},
+ computed: {
+ descriptionHtml() {
+ return this.state.descriptionHtml;
+ },
+ descriptionText() {
+ return this.state.descriptionText;
+ },
+ updatedAt() {
+ return this.state.updated_at;
+ },
+ taskStatus() {
+ return this.state.taskStatus;
+ },
+ },
watch: {
descriptionHtml() {
this.animateChange();
@@ -102,7 +105,8 @@
<description-field
v-if="showForm"
:store="store"
- :markdown-preview-url="markdownPreviewUrl" />
+ :markdown-preview-url="markdownPreviewUrl"
+ :markdown-docs="markdownDocs" />
<div
v-else-if="descriptionHtml"
class="description"