diff --git a/src/commands/Folders.ts b/src/commands/Folders.ts index bb4ecf51..8d4576d3 100644 --- a/src/commands/Folders.ts +++ b/src/commands/Folders.ts @@ -175,11 +175,14 @@ export class Folders { let staticFolder = Settings.get(SETTING_CONTENT_STATIC_FOLDER); if (staticFolder && (staticFolder.includes(WORKSPACE_PLACEHOLDER) || staticFolder === '/')) { - staticFolder = Folders.getAbsFilePath(staticFolder); + staticFolder = + staticFolder === '/' + ? Folders.getAbsFilePath('[[workspace]]') + : Folders.getAbsFilePath(staticFolder); const wsFolder = Folders.getWorkspaceFolder(); if (wsFolder) { const relativePath = relative(parseWinPath(wsFolder.fsPath), parseWinPath(staticFolder)); - return relativePath; + return relativePath === '' ? '/' : relativePath; } } diff --git a/src/dashboardWebView/components/Media/Item.tsx b/src/dashboardWebView/components/Media/Item.tsx index 4a528b3d..794ebebf 100644 --- a/src/dashboardWebView/components/Media/Item.tsx +++ b/src/dashboardWebView/components/Media/Item.tsx @@ -109,7 +109,10 @@ export const Item: React.FunctionComponent = ({ relPath = mediaParsed.split(wsFolderParsed).pop(); - if (settings.staticFolder && relPath) { + // If the static folder is the root, we can just return the relative path + if (settings.staticFolder === "/") { + return relPath; + } else if (settings.staticFolder && relPath) { const staticFolderParsed = parseWinPath(settings.staticFolder); relPath = relPath.split(staticFolderParsed).pop(); }