Merge pull request #4899 from nextcloud/backport/4875/stable27

[stable27] fix(mermaid): Only switch back on failure if in preview mode
nextcloud · Oct 27, 2023 · bcba1f2 · bcba1f2
2 parents 35e15d7 + c2ecd8c
commit bcba1f2
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/nodes/CodeBlockView.vue b/src/nodes/CodeBlockView.vue
@@ -150,7 +150,9 @@ export default {
 				this.$refs.preview.innerHTML = svg
 			} catch (e) {
 				console.debug('Invalid mermaid source', e)
-				this.viewMode = this.isEditable ? 'side-by-side' : 'code'
+				if (this.viewMode === 'preview') {
+					this.viewMode = this.isEditable ? 'side-by-side' : 'code'
+				}
 			}
 		}, 250)