diff options
Diffstat (limited to 'app/assets/javascripts/issue_show/components/description.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/description.vue | 78 |
1 files changed, 27 insertions, 51 deletions
diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue index fb542c70489..fc73d5db899 100644 --- a/app/assets/javascripts/issue_show/components/description.vue +++ b/app/assets/javascripts/issue_show/components/description.vue @@ -1,6 +1,5 @@ <script> import animateMixin from '../mixins/animate'; - import descriptionField from './fields/description.vue'; export default { mixins: [animateMixin], @@ -9,45 +8,32 @@ type: Boolean, required: true, }, - store: { - type: Object, + descriptionHtml: { + type: String, required: true, }, - showForm: { - type: Boolean, + descriptionText: { + type: String, required: true, }, - markdownPreviewUrl: { + updatedAt: { type: String, - required: true, + required: false, + default: '', }, - markdownDocs: { + taskStatus: { type: String, - required: true, + required: false, + default: '', }, }, 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(); @@ -91,9 +77,6 @@ } }, }, - components: { - descriptionField, - }, mounted() { this.renderGFM(); }, @@ -101,32 +84,25 @@ </script> <template> - <div :class="{ 'common-note-form': showForm }"> - <description-field - v-if="showForm" - :store="store" - :markdown-preview-url="markdownPreviewUrl" - :markdown-docs="markdownDocs" /> + <div + v-else-if="descriptionHtml" + class="description" + :class="{ + 'js-task-list-container': canUpdate + }"> <div - v-else-if="descriptionHtml" - class="description" + class="wiki" :class="{ - 'js-task-list-container': canUpdate - }"> - <div - class="wiki" - :class="{ - 'issue-realtime-pre-pulse': preAnimation, - 'issue-realtime-trigger-pulse': pulseAnimation - }" - v-html="descriptionHtml" - ref="gfm-content"> - </div> - <textarea - class="hidden js-task-list-field" - v-if="descriptionText" - v-model="descriptionText"> - </textarea> + 'issue-realtime-pre-pulse': preAnimation, + 'issue-realtime-trigger-pulse': pulseAnimation + }" + v-html="descriptionHtml" + ref="gfm-content"> </div> + <textarea + class="hidden js-task-list-field" + v-if="descriptionText" + v-model="descriptionText"> + </textarea> </div> </template> |