BigW Consortium Gitlab

Commit 96a46521 by Phil Hughes

Added markdown docs link

[ci skip]
parent aa6d92ae
......@@ -45,6 +45,10 @@ export default {
type: String,
required: true,
},
markdownDocs: {
type: String,
required: true,
},
},
data() {
const store = new Store({
......@@ -152,11 +156,8 @@ export default {
:store="store"
:show-form="showForm"
:can-update="canUpdate"
:description-html="state.descriptionHtml"
:description-text="state.descriptionText"
:updated-at="state.updatedAt"
:task-status="state.taskStatus"
:markdown-preview-url="markdownPreviewUrl" />
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs" />
<edit-actions
v-if="canUpdate && showForm"
:can-destroy="canDestroy" />
......
......@@ -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"
......
......@@ -12,6 +12,10 @@
type: String,
required: true,
},
markdownDocs: {
type: String,
required: true,
},
},
data() {
return {
......@@ -32,7 +36,8 @@
Description
</label>
<markdown-field
:markdown-preview-url="markdownPreviewUrl">
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs">
<textarea
id="issue-description"
class="note-textarea js-gfm-input js-autosize markdown-area"
......
......@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', () => {
endpoint,
issuableRef,
markdownPreviewUrl,
markdownDocs,
} = issuableElement.dataset;
return {
......@@ -37,6 +38,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml: issuableDescriptionElement ? issuableDescriptionElement.innerHTML : '',
initialDescriptionText: issuableDescriptionTextarea ? issuableDescriptionTextarea.textContent : '',
markdownPreviewUrl,
markdownDocs,
};
},
render(createElement) {
......@@ -50,6 +52,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml: this.initialDescriptionHtml,
initialDescriptionText: this.initialDescriptionText,
markdownPreviewUrl: this.markdownPreviewUrl,
markdownDocs: this.markdownDocs,
},
});
},
......
......@@ -10,6 +10,10 @@
required: false,
default: '',
},
markdownDocs: {
type: String,
required: true,
},
},
data() {
return {
......@@ -84,7 +88,8 @@
aria-hidden="true">
</i>
</a>
<markdown-toolbar />
<markdown-toolbar
:markdown-docs="markdownDocs" />
</div>
</div>
<div
......
<script>
export default {
props: {
markdownDocs: {
type: String,
required: true,
},
},
};
</script>
<template>
<div class="comment-toolbar clearfix">
<div class="toolbar-text">
<a
href="/docs"
:href="markdownDocs"
target="_blank"
tabindex="-1">
Markdown is supported
......
......@@ -56,6 +56,7 @@
"can-destroy" => can?(current_user, :destroy_issue, @issue).to_s,
"issuable-ref" => @issue.to_reference,
"markdown-preview-url" => preview_markdown_path(@project),
"markdown-docs" => help_page_path('user/markdown'),
} }
%h2.title= markdown_field(@issue, :title)
- 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