From dabbe1805b6c4a9e244bb6e88abf64c47cf32625 Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Thu, 23 Dec 2021 09:20:52 +0100
Subject: [PATCH] fix errors on articles without definitions
---
src/components/Article.vue | 9 ++++++++-
src/components/Header.vue | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/Article.vue b/src/components/Article.vue
index 7bb88477..b012e698 100644
--- a/src/components/Article.vue
+++ b/src/components/Article.vue
@@ -87,7 +87,12 @@ export default {
computed: {
snippet: function() {
- return this.parse_definitions(this.article.body.definitions)
+ if (this.article.body.definitions) {
+ return this.parse_definitions(this.article.body.definitions)
+ }
+ return null
+
+
},
collapsable: function() {
@@ -136,6 +141,7 @@ export default {
let definitionTexts = []
node.forEach((definition) => {
+ if (definition.elements) {
if (definition.elements[0].content) {
let new_string = ""
let old_parts = definition.elements[0].content.split(/(\$)/)
@@ -171,6 +177,7 @@ export default {
else if (definition.elements[0].elements) {
definitionTexts.push(this.parse_definitions(definition.elements))
}
+ }
})
let definitions = definitionTexts.join(" | ")
diff --git a/src/components/Header.vue b/src/components/Header.vue
index c7b29e0a..1f79f332 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -24,8 +24,8 @@
</v-card>
</v-menu>)
</span>
- <span v-if="$parent.collapsed && $parent.has_content" class="definition_snippet">
- | {{$parent.snippet}}
+ <span v-if="$parent.collapsed && $parent.snippet && $parent.has_content" class="definition_snippet">
+ {{group_list.length? "| ":""}}{{$parent.snippet}}
</span> <span v-if="$parent.collapsable" >
<v-btn class="expand_icon"
:title="$parent.collapsed? 'Vis mer' : 'Kollaps'"
--
GitLab