1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-04 19:16:07 +02:00

Desktop: Disabled emoji highlighting in editor when emoji plugin is disabled (#3852)

This commit is contained in:
Rahil Sarvaiya 2020-10-10 02:13:39 +05:30 committed by GitHub
parent d965a7b6db
commit c42d9cf069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
import 'codemirror/addon/mode/multiplex';
import 'codemirror/mode/stex/stex';
const Setting = require('lib/models/Setting.js');
// Joplin markdown is a the same as markdown mode, but it has configured defaults
// and support for katex math blocks
@ -10,7 +11,7 @@ export default function useJoplinMode(CodeMirror: any) {
name: 'markdown',
taskLists: true,
strikethrough: true,
emoji: true,
emoji: Setting.value('markdown.plugin.emoji'),
tokenTypeOverrides: {
linkText: 'link-text',
},
@ -33,7 +34,7 @@ export default function useJoplinMode(CodeMirror: any) {
}
return {
startState: function(): {outer: any, openCharacter: string, inner: any} {
startState: function(): { outer: any, openCharacter: string, inner: any } {
return {
outer: CodeMirror.startState(markdownMode),
openCharacter: '',