summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2019-08-27 19:44:49 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-27 19:44:49 +0900
commit9d65768d4ddf98cb4fcccf937c44ba5d9eb17d1b (patch)
treeaa1a62a4ea0e97294bfe5d21bfba9306f84b4375
parentexcludeNsfwやCWのNSFW扱いなど (#5341) (diff)
downloadsharkey-9d65768d4ddf98cb4fcccf937c44ba5d9eb17d1b.tar.gz
sharkey-9d65768d4ddf98cb4fcccf937c44ba5d9eb17d1b.tar.bz2
sharkey-9d65768d4ddf98cb4fcccf937c44ba5d9eb17d1b.zip
[MFM] Fallback to js if specified lang is not available (#5347)
-rw-r--r--src/client/app/common/views/components/code-core.vue12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/code-core.vue b/src/client/app/common/views/components/code-core.vue
index d6200abd0e..219ed1d80a 100644
--- a/src/client/app/common/views/components/code-core.vue
+++ b/src/client/app/common/views/components/code-core.vue
@@ -1,16 +1,16 @@
<template>
-<prism :inline="inline" :language="lang || 'js'">{{ code }}</prism>
+<x-prism :inline="inline" :language="prismLang">{{ code }}</x-prism>
</template>
<script lang="ts">
import Vue from 'vue';
import 'prismjs';
import 'prismjs/themes/prism-okaidia.css';
-import Prism from 'vue-prism-component';
+import XPrism from 'vue-prism-component';
export default Vue.extend({
components: {
- Prism
+ XPrism
},
props: {
code: {
@@ -25,6 +25,12 @@ export default Vue.extend({
type: Boolean,
required: false
}
+ },
+
+ computed: {
+ prismLang() {
+ return Prism.languages[this.lang] ? this.lang : 'js';
+ }
}
});
</script>