self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

Desktop: Fixes #9932: Fix only one CodeMirror 6 content script loaded per plugin (#9934)

Browse Source
This commit is contained in:
Henry Heino
2024-02-19 02:29:37 -08:00
committed by GitHub
parent e2a79c16c1
commit 2aea7fcc25
6 changed files with 85 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/app-mobile/components/NoteEditor/NoteEditor.tsx
View File

@ -15,7 +15,7 @@ import { EditorControl, EditorSettings, SelectionRange } from './types';
import { _ } from '@joplin/lib/locale';
import MarkdownToolbar from './MarkdownToolbar/MarkdownToolbar';
import { ChangeEvent, EditorEvent, EditorEventType, SelectionRangeChangeEvent, UndoRedoDepthChangeEvent } from '@joplin/editor/events';
import { EditorCommandType, EditorKeymap, EditorLanguageType, PluginData, SearchState } from '@joplin/editor/types';
import { EditorCommandType, EditorKeymap, EditorLanguageType, ContentScriptData, SearchState } from '@joplin/editor/types';
import supportsCommand from '@joplin/editor/CodeMirror/editorCommands/supportsCommand';
import SelectionFormatting, { defaultSelectionFormatting } from '@joplin/editor/SelectionFormatting';
import Logger from '@joplin/utils/Logger';
@ -240,8 +240,8 @@ const useEditorControl = (
injectJS('document.activeElement?.blur();');
},
setPlugins: async (plugins: PluginData[]) => {
injectJS(`cm.setPlugins(${JSON.stringify(plugins)});`);
setContentScripts: async (plugins: ContentScriptData[]) => {
injectJS(`cm.setContentScripts(${JSON.stringify(plugins)});`);
},
setSearchState: setSearchStateCallback,