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

Desktop: Plugins: Prevent plugin dialogs, panels, and editors from accessing the main JavaScript context (#12083)

Browse Source
This commit is contained in:
Henry Heino
2025-04-12 03:49:03 -07:00
committed by GitHub
parent 9638cab9ea
commit 527627b8bb
20 changed files with 300 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/lib/commands/renderMarkup.ts
View File

@ -1,6 +1,7 @@
import markupLanguageUtils from '../markupLanguageUtils';
import Setting from '../models/Setting';
import { CommandRuntime, CommandDeclaration, CommandContext } from '../services/CommandService';
import shim from '../shim';
import { themeStyle } from '../theme';
import attachedResources from '../utils/attachedResources';
import { MarkupLanguage } from '@joplin/renderer';
@ -12,8 +13,13 @@ export const declaration: CommandDeclaration = {
};
const getMarkupToHtml = () => {
// In the desktop app, resources accessed with file:// URLs can't be displayed in certain places (e.g. the note
// viewer and plugin WebViews). On mobile, however, joplin-content:// URLs don't work. As such, use different
// protocols on different platforms:
const protocol = shim.isElectron() ? 'joplin-content://note-viewer/' : 'file://';
return markupLanguageUtils.newMarkupToHtml({}, {
resourceBaseUrl: `file://${Setting.value('resourceDir')}/`,
resourceBaseUrl: `${protocol}${Setting.value('resourceDir')}/`,
customCss: '',
});
};