Merge pull request #3709 from PJB3005/23-03-14-mermaid-code-mode

Avoid EditableCode inheriting mode from previous notes.
This commit is contained in:
zadam 2023-03-14 21:12:01 +01:00 committed by GitHub
commit af4470ead1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,12 +77,15 @@ export default class EditableCodeTypeWidget extends TypeWidget {
this.codeEditor.setValue(noteComplement.content || ""); this.codeEditor.setValue(noteComplement.content || "");
this.codeEditor.clearHistory(); this.codeEditor.clearHistory();
const info = CodeMirror.findModeByMIME(note.mime); let info = CodeMirror.findModeByMIME(note.mime);
if (!info) {
if (info) { // Switch back to plain text if CodeMirror does not have a mode for whatever MIME type we're editing.
this.codeEditor.setOption("mode", info.mime); // To avoid inheriting a mode from a previously open code note.
CodeMirror.autoLoadMode(this.codeEditor, info.mode); info = CodeMirror.findModeByMIME("text/plain");
} }
this.codeEditor.setOption("mode", info.mime);
CodeMirror.autoLoadMode(this.codeEditor, info.mode);
}); });
this.show(); this.show();