From d2625180234f1cb346bb86f9a4569f2c39cb2ab6 Mon Sep 17 00:00:00 2001 From: Elio Struyf Date: Fri, 17 May 2024 16:13:23 +0200 Subject: [PATCH] #806 - Fix preview URL --- CHANGELOG.md | 1 + src/commands/Article.ts | 15 +++++++-------- src/commands/Preview.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d2ff239..b4765b56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - [#796](https://github.com/estruyf/vscode-front-matter/issues/796): Fix issue in retrieving folders/files on dashboard load - [#801](https://github.com/estruyf/vscode-front-matter/issues/801): Faster folder processing on updates - [#804](https://github.com/estruyf/vscode-front-matter/issues/804): Fix blinking of the front matter content area +- [#806](https://github.com/estruyf/vscode-front-matter/issues/804): Fix preview URL for `index.md` files in root of the page folder path ## [10.1.0] - 2024-04-11 - [Release notes](https://beta.frontmatter.codes/updates/v10.1.0) diff --git a/src/commands/Article.ts b/src/commands/Article.ts index f533cfb5..ca3b5463 100644 --- a/src/commands/Article.ts +++ b/src/commands/Article.ts @@ -291,6 +291,13 @@ export class Article { return; } + const file = parseWinPath(editor.document.fileName); + if (!isValidFile(file)) { + return; + } + + const parsedFile = parse(file); + const slugTemplate = Settings.get(SETTING_SLUG_TEMPLATE); if (slugTemplate) { if (slugTemplate === '{{title}}') { @@ -306,14 +313,6 @@ export class Article { } } - const file = parseWinPath(editor.document.fileName); - - if (!isValidFile(file)) { - return; - } - - const parsedFile = parse(file); - if (parsedFile.name.toLowerCase() !== 'index') { return parsedFile.name; } diff --git a/src/commands/Preview.ts b/src/commands/Preview.ts index 310e7353..2aacf8c3 100644 --- a/src/commands/Preview.ts +++ b/src/commands/Preview.ts @@ -312,7 +312,7 @@ export class Preview { pathname = processPathPlaceholders(pathname, relativePath, filePath, selectedFolder); const file = parse(filePath); - if (file.name.toLowerCase() === 'index' && pathname.endsWith(slug)) { + if (file.name.toLowerCase() === 'index' && (pathname.endsWith(slug) || !pathname)) { slug = ''; } }