Merge branch 'master' into develop
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
|
||||
<script lang="js">
|
||||
import { marked } from 'marked';
|
||||
import DOMPurify from 'dompurify';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@@ -20,7 +21,7 @@ export default {
|
||||
computed: {
|
||||
compiledMarkdown() {
|
||||
if (!this.markdown) return;
|
||||
return marked(this.markdown);
|
||||
return DOMPurify.sanitize(marked(this.markdown));
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import DOMPurify from 'dompurify';
|
||||
marked.setOptions({
|
||||
breaks: true,
|
||||
gfm: true,
|
||||
sanitizer: DOMPurify.sanitize,
|
||||
silent: true,
|
||||
smartLists: true,
|
||||
smartypants: true,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dicecloud",
|
||||
"version": "2.0.55",
|
||||
"version": "2.0.57",
|
||||
"description": "Unofficial Online Realtime D&D 5e App",
|
||||
"license": "GPL-3.0",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user