From cdb9d3f05b58af269cf8394e946ea9ca722d77db Mon Sep 17 00:00:00 2001
From: Dominik Seeger <dominik.seeger@stud.uni-goettingen.de>
Date: Mon, 9 Dec 2019 17:36:13 +0100
Subject: [PATCH] fixed rendering and comment issues
The rendering issue where angular brackets would mess up the HTML has
been fixed. Also, it is now possible to write multi-line comments again.
---
.../src/components/submission_notes/base/FeedbackComment.vue | 4 +---
frontend/src/store/modules/submission-notes.ts | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/frontend/src/components/submission_notes/base/FeedbackComment.vue b/frontend/src/components/submission_notes/base/FeedbackComment.vue
index a8c0eded..a2afbacd 100644
--- a/frontend/src/components/submission_notes/base/FeedbackComment.vue
+++ b/frontend/src/components/submission_notes/base/FeedbackComment.vue
@@ -44,9 +44,7 @@
<span>Won't be visible to student</span>
</v-tooltip>
</div>
- <div class="message">
- {{ text }}
- </div>
+ <pre><div class="message">{{ text }}</div></pre>
<v-btn
v-if="deletable"
flat
diff --git a/frontend/src/store/modules/submission-notes.ts b/frontend/src/store/modules/submission-notes.ts
index 78bc156b..72caa195 100644
--- a/frontend/src/store/modules/submission-notes.ts
+++ b/frontend/src/store/modules/submission-notes.ts
@@ -75,6 +75,8 @@ const submissionGetter = mb.read(function submission(state, getters) {
let highlighted = state.submission.text || ''
if (language !== SubmissionType.ProgrammingLanguageEnum.Markdown) {
highlighted = hljs.highlight(language, highlighted, true).value
+ } else if (language === SubmissionType.ProgrammingLanguageEnum.Markdown) {
+ highlighted = hljs.highlight('plaintext', highlighted, true).value
}
// const highlighted = state.submission.text || ''
const postProcessed = syntaxPostProcess(highlighted)
--
GitLab