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

Web: Fix renderer plugin assets fail to load on secondary profiles (#10903)

Browse Source
This commit is contained in:
Henry Heino
2024-08-22 13:52:42 -07:00
committed by GitHub
parent 78015028ec
commit a1c64eeefc
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/app-mobile/components/NoteBodyViewer/hooks/useRerenderHandler.ts
View File

@@ -11,6 +11,7 @@ import Setting from '@joplin/lib/models/Setting';
import shim from '@joplin/lib/shim';
import Resource from '@joplin/lib/models/Resource';
import { ResourceEntity } from '@joplin/lib/services/database/types';
import resolvePathWithinDir from '@joplin/lib/utils/resolvePathWithinDir';
export interface ResourceInfo {
@@ -179,9 +180,19 @@ const useRerenderHandler = (props: Props) => {
}
},
readAssetBlob: (assetPath: string) => {
const assetsDir = `${Setting.value('resourceDir')}/`;
const path = shim.fsDriver().resolveRelativePathWithinDir(assetsDir, assetPath);
return shim.fsDriver().fileAtPath(path);
// Built-in assets are in resourceDir, external plugin assets are in cacheDir.
const assetsDirs = [Setting.value('resourceDir'), Setting.value('cacheDir')];
let resolvedPath = null;
for (const assetDir of assetsDirs) {
resolvedPath ??= resolvePathWithinDir(assetDir, assetPath);
if (resolvedPath) break;
}
if (!resolvedPath) {
throw new Error(`Failed to load asset at ${assetPath} -- not in any of the allowed asset directories: ${assetsDirs.join(',')}.`);
}
return shim.fsDriver().fileAtPath(resolvedPath);
},
createEditPopupSyntax,