Commit 96a46521 authored by Phil Hughes's avatar Phil Hughes

Added markdown docs link

[ci skip]
parent aa6d92ae
...@@ -45,6 +45,10 @@ export default { ...@@ -45,6 +45,10 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
markdownDocs: {
type: String,
required: true,
},
}, },
data() { data() {
const store = new Store({ const store = new Store({
...@@ -152,11 +156,8 @@ export default { ...@@ -152,11 +156,8 @@ export default {
:store="store" :store="store"
:show-form="showForm" :show-form="showForm"
:can-update="canUpdate" :can-update="canUpdate"
:description-html="state.descriptionHtml" :markdown-preview-url="markdownPreviewUrl"
:description-text="state.descriptionText" :markdown-docs="markdownDocs" />
:updated-at="state.updatedAt"
:task-status="state.taskStatus"
:markdown-preview-url="markdownPreviewUrl" />
<edit-actions <edit-actions
v-if="canUpdate && showForm" v-if="canUpdate && showForm"
:can-destroy="canDestroy" /> :can-destroy="canDestroy" />
......
...@@ -9,22 +9,6 @@ ...@@ -9,22 +9,6 @@
type: Boolean, type: Boolean,
required: true, required: true,
}, },
descriptionHtml: {
type: String,
required: true,
},
descriptionText: {
type: String,
required: true,
},
updatedAt: {
type: String,
required: true,
},
taskStatus: {
type: String,
required: true,
},
store: { store: {
type: Object, type: Object,
required: true, required: true,
...@@ -37,14 +21,33 @@ ...@@ -37,14 +21,33 @@
type: String, type: String,
required: true, required: true,
}, },
markdownDocs: {
type: String,
required: true,
},
}, },
data() { data() {
return { return {
state: this.store.state,
preAnimation: false, preAnimation: false,
pulseAnimation: false, pulseAnimation: false,
timeAgoEl: $('.js-issue-edited-ago'), 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: { watch: {
descriptionHtml() { descriptionHtml() {
this.animateChange(); this.animateChange();
...@@ -102,7 +105,8 @@ ...@@ -102,7 +105,8 @@
<description-field <description-field
v-if="showForm" v-if="showForm"
:store="store" :store="store"
:markdown-preview-url="markdownPreviewUrl" /> :markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs" />
<div <div
v-else-if="descriptionHtml" v-else-if="descriptionHtml"
class="description" class="description"
......
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
type: String, type: String,
required: true, required: true,
}, },
markdownDocs: {
type: String,
required: true,
},
}, },
data() { data() {
return { return {
...@@ -32,7 +36,8 @@ ...@@ -32,7 +36,8 @@
Description Description
</label> </label>
<markdown-field <markdown-field
:markdown-preview-url="markdownPreviewUrl"> :markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs">
<textarea <textarea
id="issue-description" id="issue-description"
class="note-textarea js-gfm-input js-autosize markdown-area" class="note-textarea js-gfm-input js-autosize markdown-area"
......
...@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', () => {
endpoint, endpoint,
issuableRef, issuableRef,
markdownPreviewUrl, markdownPreviewUrl,
markdownDocs,
} = issuableElement.dataset; } = issuableElement.dataset;
return { return {
...@@ -37,6 +38,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -37,6 +38,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml: issuableDescriptionElement ? issuableDescriptionElement.innerHTML : '', initialDescriptionHtml: issuableDescriptionElement ? issuableDescriptionElement.innerHTML : '',
initialDescriptionText: issuableDescriptionTextarea ? issuableDescriptionTextarea.textContent : '', initialDescriptionText: issuableDescriptionTextarea ? issuableDescriptionTextarea.textContent : '',
markdownPreviewUrl, markdownPreviewUrl,
markdownDocs,
}; };
}, },
render(createElement) { render(createElement) {
...@@ -50,6 +52,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -50,6 +52,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml: this.initialDescriptionHtml, initialDescriptionHtml: this.initialDescriptionHtml,
initialDescriptionText: this.initialDescriptionText, initialDescriptionText: this.initialDescriptionText,
markdownPreviewUrl: this.markdownPreviewUrl, markdownPreviewUrl: this.markdownPreviewUrl,
markdownDocs: this.markdownDocs,
}, },
}); });
}, },
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
required: false, required: false,
default: '', default: '',
}, },
markdownDocs: {
type: String,
required: true,
},
}, },
data() { data() {
return { return {
...@@ -84,7 +88,8 @@ ...@@ -84,7 +88,8 @@
aria-hidden="true"> aria-hidden="true">
</i> </i>
</a> </a>
<markdown-toolbar /> <markdown-toolbar
:markdown-docs="markdownDocs" />
</div> </div>
</div> </div>
<div <div
......
<script> <script>
export default {
props: {
markdownDocs: {
type: String,
required: true,
},
},
};
</script> </script>
<template> <template>
<div class="comment-toolbar clearfix"> <div class="comment-toolbar clearfix">
<div class="toolbar-text"> <div class="toolbar-text">
<a <a
href="/docs" :href="markdownDocs"
target="_blank" target="_blank"
tabindex="-1"> tabindex="-1">
Markdown is supported Markdown is supported
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
"can-destroy" => can?(current_user, :destroy_issue, @issue).to_s, "can-destroy" => can?(current_user, :destroy_issue, @issue).to_s,
"issuable-ref" => @issue.to_reference, "issuable-ref" => @issue.to_reference,
"markdown-preview-url" => preview_markdown_path(@project), "markdown-preview-url" => preview_markdown_path(@project),
"markdown-docs" => help_page_path('user/markdown'),
} } } }
%h2.title= markdown_field(@issue, :title) %h2.title= markdown_field(@issue, :title)
- if @issue.description.present? - if @issue.description.present?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment