From 62c4b5e1492d338836c59d5f1ca8a57cb81d4e1f Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Tue, 7 Jan 2025 11:54:21 +0100 Subject: [PATCH] Fix code style issues --- src/folderOverview/esbuild.config.mjs | 6 +- src/folderOverview/src/Commands.ts | 2 +- src/folderOverview/src/FileExplorer.ts | 6 +- src/folderOverview/src/FolderOverview.ts | 10 +- src/folderOverview/src/modals/Settings.ts | 2 +- src/folderOverview/src/utils/ListComponent.ts | 8 +- src/functions/ListComponent.ts | 8 +- src/functions/excalidraw.ts | 2 +- src/functions/folderNoteFunctions.ts | 2 +- src/functions/styleFunctions.ts | 206 +++++++++--------- src/functions/utils.ts | 50 ++--- src/main.ts | 8 +- src/modals/AddSupportedFileType.ts | 2 +- src/modals/AskForExtension.ts | 6 +- src/modals/ConfirmCreation.ts | 2 +- src/modals/DeleteConfirmation.ts | 4 +- src/settings/ExcludedFoldersSettings.ts | 2 +- src/settings/FileExplorerSettings.ts | 4 +- src/settings/FolderOverviewSettings.ts | 8 +- src/settings/GeneralSettings.ts | 10 +- src/settings/PathSettings.ts | 4 +- 21 files changed, 176 insertions(+), 176 deletions(-) diff --git a/src/folderOverview/esbuild.config.mjs b/src/folderOverview/esbuild.config.mjs index 786cebb..6aafc7f 100644 --- a/src/folderOverview/esbuild.config.mjs +++ b/src/folderOverview/esbuild.config.mjs @@ -1,5 +1,5 @@ -import esbuild from "esbuild"; -import process from "process"; +import esbuild from 'esbuild'; +import process from 'process'; import builtins from 'builtin-modules' const banner = @@ -35,7 +35,7 @@ esbuild.build({ format: 'cjs', watch: !prod, target: 'es2018', - logLevel: "info", + logLevel: 'info', sourcemap: prod ? false : 'inline', treeShaking: true, outfile: 'main.js', diff --git a/src/folderOverview/src/Commands.ts b/src/folderOverview/src/Commands.ts index 76999ad..3b9bae0 100644 --- a/src/folderOverview/src/Commands.ts +++ b/src/folderOverview/src/Commands.ts @@ -1,4 +1,4 @@ -import FolderOverviewPlugin from "./main"; +import FolderOverviewPlugin from './main'; export function registerCommands(plugin: FolderOverviewPlugin) { plugin.addCommand({ diff --git a/src/folderOverview/src/FileExplorer.ts b/src/folderOverview/src/FileExplorer.ts index afef099..6bfc4e7 100644 --- a/src/folderOverview/src/FileExplorer.ts +++ b/src/folderOverview/src/FileExplorer.ts @@ -198,7 +198,7 @@ export class FileExplorerOverview { } if (excludedFolder?.excludeFromFolderOverview) { return; } - const svg = ''; + const svg = ''; if (yaml.includeTypes.includes('folder')) { folderElement = childrenElement.createDiv({ cls: 'tree-item nav-folder', @@ -242,7 +242,7 @@ export class FileExplorerOverview { const { draggable } = plugin.app.dragManager; if (draggable && draggable.file instanceof TFolder) { folderElement?.classList.add('is-being-dragged-over'); - plugin.app.dragManager.setAction(window.i18next.t("interface.drag-and-drop.move-into-folder", { folder: child.name })); + plugin.app.dragManager.setAction(window.i18next.t('interface.drag-and-drop.move-into-folder', { folder: child.name })); } }); @@ -337,7 +337,7 @@ export class FileExplorerOverview { e.preventDefault(); const { draggable } = plugin.app.dragManager; if (draggable && draggable.file instanceof TFolder) { - plugin.app.dragManager.setAction(window.i18next.t("interface.drag-and-drop.move-into-folder", { folder: child.parent?.name || '' })); + plugin.app.dragManager.setAction(window.i18next.t('interface.drag-and-drop.move-into-folder', { folder: child.parent?.name || '' })); const folderEL = folderOverview.getElFromOverview(child.parent?.path || '') if (folderEL) { folderEL.parentElement?.classList.add('is-being-dragged-over'); diff --git a/src/folderOverview/src/FolderOverview.ts b/src/folderOverview/src/FolderOverview.ts index dfc67b9..baa4d63 100644 --- a/src/folderOverview/src/FolderOverview.ts +++ b/src/folderOverview/src/FolderOverview.ts @@ -379,7 +379,7 @@ export class FolderOverview { fileMenu.addSeparator(); fileMenu.addItem((item) => { - item.setTitle(window.i18next.t("plugins.file-explorer.menu-opt-rename")); + item.setTitle(window.i18next.t('plugins.file-explorer.menu-opt-rename')); item.setIcon('pencil'); item.onClick(async () => { plugin.app.fileManager.promptForFileRename(file) @@ -387,7 +387,7 @@ export class FolderOverview { }); fileMenu.addItem((item) => { - item.setTitle(window.i18next.t("plugins.file-explorer.menu-opt-delete")); + item.setTitle(window.i18next.t('plugins.file-explorer.menu-opt-delete')); item.setIcon('trash'); item.dom.addClass('is-warning'); item.dom.setAttribute('data-section', 'danger') @@ -398,7 +398,7 @@ export class FolderOverview { fileMenu.addSeparator(); - plugin.app.workspace.trigger('file-menu', fileMenu, file, "folder-overview-file-context-menu", null); + plugin.app.workspace.trigger('file-menu', fileMenu, file, 'folder-overview-file-context-menu', null); fileMenu.showAtPosition({ x: e.pageX, y: e.pageY }); } @@ -429,12 +429,12 @@ export class FolderOverview { folderMenu.addSeparator(); - plugin.app.workspace.trigger('file-menu', folderMenu, folder, "folder-overview-folder-context-menu", null); + plugin.app.workspace.trigger('file-menu', folderMenu, folder, 'folder-overview-folder-context-menu', null); folderMenu.showAtPosition({ x: e.pageX, y: e.pageY }); } getElFromOverview(path: string): HTMLElement | null { - const el = this.listEl.querySelector(`[data-path="${CSS.escape(path)}"]`) as HTMLElement | null; + const el = this.listEl.querySelector(`[data-path='${CSS.escape(path)}']`) as HTMLElement | null; return el; } diff --git a/src/folderOverview/src/modals/Settings.ts b/src/folderOverview/src/modals/Settings.ts index 53e7ab0..c459a5c 100644 --- a/src/folderOverview/src/modals/Settings.ts +++ b/src/folderOverview/src/modals/Settings.ts @@ -4,7 +4,7 @@ import { ListComponent } from '../utils/ListComponent'; import { updateYaml } from '../FolderOverview'; import { FolderSuggest } from '../suggesters/FolderSuggester'; import { getFolderPathFromString } from '../utils/functions'; -import { createOverviewSettings } from "../settings"; +import { createOverviewSettings } from '../settings'; import FolderOverviewPlugin from 'src/main'; import FolderNotesPlugin from '../../../main'; export class FolderOverviewSettings extends Modal { diff --git a/src/folderOverview/src/utils/ListComponent.ts b/src/folderOverview/src/utils/ListComponent.ts index e5b34c5..946a770 100644 --- a/src/folderOverview/src/utils/ListComponent.ts +++ b/src/folderOverview/src/utils/ListComponent.ts @@ -1,4 +1,4 @@ -import { CustomEventEmitter } from "./EventEmitter"; +import { CustomEventEmitter } from './EventEmitter'; export class ListComponent { emitter: CustomEventEmitter; @@ -54,7 +54,7 @@ export class ListComponent { } span.setAttribute('extension', value); const removeSpan = span.createEl('span', { cls: 'ofn-list-item-remove setting-hotkey-icon' }); - const svg = ''; + const svg = ''; const svgElement = removeSpan.createEl('span', { cls: 'ofn-list-item-remove-icon' }); svgElement.innerHTML = svg; removeSpan.onClickEvent((e) => { @@ -73,7 +73,7 @@ export class ListComponent { addResetButton() { const resetButton = this.controlEl.createEl('span', { cls: 'clickable-icon setting-restore-hotkey-button' }); - const svg = ''; + const svg = ''; resetButton.innerHTML = svg; resetButton.onClickEvent((e) => { this.setValues(this.defaultValues); @@ -83,7 +83,7 @@ export class ListComponent { removeValue(value: string) { this.values = this.values.filter((v) => v !== value); - this.listEl.find(`[extension="${value}"]`).remove(); + this.listEl.find(`[extension='${value}']`).remove(); this.emit('remove', value); this.emit('update', this.values); } diff --git a/src/functions/ListComponent.ts b/src/functions/ListComponent.ts index df34fff..8354c85 100644 --- a/src/functions/ListComponent.ts +++ b/src/functions/ListComponent.ts @@ -1,4 +1,4 @@ -import { CustomEventEmitter } from "src/events/EventEmitter"; +import { CustomEventEmitter } from 'src/events/EventEmitter'; export class ListComponent { emitter: CustomEventEmitter; @@ -54,7 +54,7 @@ export class ListComponent { } span.setAttribute('extension', value); const removeSpan = span.createEl('span', { cls: 'ofn-list-item-remove setting-hotkey-icon' }); - const svg = ''; + const svg = ''; const svgElement = removeSpan.createEl('span', { cls: 'ofn-list-item-remove-icon' }); svgElement.innerHTML = svg; removeSpan.onClickEvent((e) => { @@ -73,7 +73,7 @@ export class ListComponent { addResetButton() { const resetButton = this.controlEl.createEl('span', { cls: 'clickable-icon setting-restore-hotkey-button' }); - const svg = ''; + const svg = ''; resetButton.innerHTML = svg; resetButton.onClickEvent((e) => { this.setValues(this.defaultValues); @@ -83,7 +83,7 @@ export class ListComponent { removeValue(value: string) { this.values = this.values.filter((v) => v !== value); - this.listEl.find(`[extension="${value}"]`).remove(); + this.listEl.find(`[extension='${value}']`).remove(); this.emit('remove', value); this.emit('update', this.values); } diff --git a/src/functions/excalidraw.ts b/src/functions/excalidraw.ts index 75cffea..74aacd2 100644 --- a/src/functions/excalidraw.ts +++ b/src/functions/excalidraw.ts @@ -1,4 +1,4 @@ -import { WorkspaceLeaf, App } from "obsidian"; +import { WorkspaceLeaf, App } from 'obsidian'; export async function openExcalidrawView(leaf: WorkspaceLeaf) { const {excalidraw, excalidrawEnabled} = await getExcalidrawPlugin(this.app); diff --git a/src/functions/folderNoteFunctions.ts b/src/functions/folderNoteFunctions.ts index 8fd9d35..9c051ce 100644 --- a/src/functions/folderNoteFunctions.ts +++ b/src/functions/folderNoteFunctions.ts @@ -22,7 +22,7 @@ tags: [excalidraw] %% # Drawing \`\`\`json -{"type":"excalidraw","version":2,"source":"https://github.com/zsviczian/obsidian-excalidraw-plugin/releases/tag/1.9.20","elements":[],"appState":{"gridSize":null,"viewBackgroundColor":"#ffffff"}} +{'type":"excalidraw","version":2,"source":"https://github.com/zsviczian/obsidian-excalidraw-plugin/releases/tag/1.9.20","elements":[],"appState":{"gridSize":null,"viewBackgroundColor":"#ffffff'}} \`\`\` %%`; diff --git a/src/functions/styleFunctions.ts b/src/functions/styleFunctions.ts index b5526b5..4a3921f 100644 --- a/src/functions/styleFunctions.ts +++ b/src/functions/styleFunctions.ts @@ -5,150 +5,150 @@ import { getFolder, getFolderNote } from 'src/functions/folderNoteFunctions'; import { getFileExplorer } from './utils'; export function loadFileClasses(forceReload = false, plugin: FolderNotesPlugin) { - if (plugin.activeFileExplorer === getFileExplorer(plugin) && !forceReload) { return; } - plugin.activeFileExplorer = getFileExplorer(plugin); - plugin.app.vault.getAllLoadedFiles().forEach(async (file) => { - if (!(file instanceof TFolder)) { return; } - const folderNote = getFolderNote(plugin, file.path); - if (!folderNote) { - removeCSSClassFromEL(file?.path, 'has-folder-note', plugin); - removeCSSClassFromEL(file?.path, 'only-has-folder-note', plugin); - plugin.isEmptyFolderNoteFolder(file) - return; - } + if (plugin.activeFileExplorer === getFileExplorer(plugin) && !forceReload) { return; } + plugin.activeFileExplorer = getFileExplorer(plugin); + plugin.app.vault.getAllLoadedFiles().forEach(async (file) => { + if (!(file instanceof TFolder)) { return; } + const folderNote = getFolderNote(plugin, file.path); + if (!folderNote) { + removeCSSClassFromEL(file?.path, 'has-folder-note', plugin); + removeCSSClassFromEL(file?.path, 'only-has-folder-note', plugin); + plugin.isEmptyFolderNoteFolder(file); + return; + } - const excludedFolder = await getExcludedFolder(plugin, file.path, true); - // cleanup after ourselves - // Incase settings have changed - if (excludedFolder?.disableFolderNote) { - removeCSSClassFromEL(folderNote.path, 'is-folder-note', plugin); - removeCSSClassFromEL(file.path, 'has-folder-note', plugin); - removeCSSClassFromEL(file?.path, 'only-has-folder-note', plugin); - } else { - if (!excludedFolder?.hideNote) { - addCSSClassToTitleEL(folderNote.path, 'is-folder-note', plugin); - } - addCSSClassesToFolder(file, plugin); - } - }); + const excludedFolder = await getExcludedFolder(plugin, file.path, true); + // cleanup after ourselves + // Incase settings have changed + if (excludedFolder?.disableFolderNote) { + removeCSSClassFromEL(folderNote.path, 'is-folder-note', plugin); + removeCSSClassFromEL(file.path, 'has-folder-note', plugin); + removeCSSClassFromEL(file?.path, 'only-has-folder-note', plugin); + } else { + if (!excludedFolder?.hideNote) { + addCSSClassToTitleEL(folderNote.path, 'is-folder-note', plugin); + } + addCSSClassesToFolder(file, plugin); + } + }); } export async function applyCSSClassesToFolder(folderPath: string, plugin: FolderNotesPlugin) { - const folder = plugin.app.vault.getAbstractFileByPath(folderPath); - if (!folder || !(folder instanceof TFolder)) { return; } + const folder = plugin.app.vault.getAbstractFileByPath(folderPath); + if (!folder || !(folder instanceof TFolder)) { return; } - const folderNote = getFolderNote(plugin, folder.path); + const folderNote = getFolderNote(plugin, folder.path); - if (!folderNote) { - removeCSSClassFromEL(folder?.path, 'has-folder-note', plugin); - removeCSSClassFromEL(folder?.path, 'only-has-folder-note', plugin); - return; - } + if (!folderNote) { + removeCSSClassFromEL(folder?.path, 'has-folder-note', plugin); + removeCSSClassFromEL(folder?.path, 'only-has-folder-note', plugin); + return; + } - const excludedFolder = await getExcludedFolder(plugin, folder.path, true); + const excludedFolder = await getExcludedFolder(plugin, folder.path, true); - if (excludedFolder?.disableFolderNote) { - removeCSSClassFromEL(folderNote.path, 'is-folder-note', plugin); - removeCSSClassFromEL(folder.path, 'has-folder-note', plugin); - removeCSSClassFromEL(folder?.path, 'only-has-folder-note', plugin); - } else { - if (!excludedFolder?.hideNote) { - addCSSClassToFolderNote(folderNote, plugin); - } - addCSSClassesToFolder(folder, plugin); - if (plugin.isEmptyFolderNoteFolder(folder)) { - addCSSClassToTitleEL(folder.path, 'only-has-folder-note', plugin); - } else { - removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); - } - } + if (excludedFolder?.disableFolderNote) { + removeCSSClassFromEL(folderNote.path, 'is-folder-note', plugin); + removeCSSClassFromEL(folder.path, 'has-folder-note', plugin); + removeCSSClassFromEL(folder?.path, 'only-has-folder-note', plugin); + } else { + if (!excludedFolder?.hideNote) { + addCSSClassToFolderNote(folderNote, plugin); + } + addCSSClassesToFolder(folder, plugin); + if (plugin.isEmptyFolderNoteFolder(folder)) { + addCSSClassToTitleEL(folder.path, 'only-has-folder-note', plugin); + } else { + removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); + } + } - addCSSClassesToBothFolderAndNote(folderNote, folder, plugin); + addCSSClassesToBothFolderAndNote(folderNote, folder, plugin); } export async function applyCSSClassesToFolderNote(filePath: string, plugin: FolderNotesPlugin) { - const file = plugin.app.vault.getAbstractFileByPath(filePath); - if (!file || !(file instanceof TFile)) { return; } + const file = plugin.app.vault.getAbstractFileByPath(filePath); + if (!file || !(file instanceof TFile)) { return; } - const folder = getFolder(plugin, file); - if (!folder || !(folder instanceof TFolder)) { return; } + const folder = getFolder(plugin, file); + if (!folder || !(folder instanceof TFolder)) { return; } - applyCSSClassesToFolder(folder.path, plugin); + applyCSSClassesToFolder(folder.path, plugin); } export function addCSSClassesToBothFolderAndNote(file: TFile, folder: TFolder, plugin: FolderNotesPlugin) { - addCSSClassToFolderNote(file, plugin); - addCSSClassesToFolder(folder, plugin); + addCSSClassToFolderNote(file, plugin); + addCSSClassesToFolder(folder, plugin); } export function removeCSSClassesFromBothFolderAndNote(folder: TFolder, file: TFile, plugin: FolderNotesPlugin) { - removeCSSClassFromFolderNote(file, plugin); - removeCSSClassesFromFolder(folder, plugin); + removeCSSClassFromFolderNote(file, plugin); + removeCSSClassesFromFolder(folder, plugin); } export function addCSSClassesToFolder(folder: TFolder, plugin: FolderNotesPlugin) { - addCSSClassToTitleEL(folder.path, 'has-folder-note', plugin); - if (plugin.isEmptyFolderNoteFolder(folder)) { - addCSSClassToTitleEL(folder.path, 'only-has-folder-note', plugin); - } else { - removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); - } + addCSSClassToTitleEL(folder.path, 'has-folder-note', plugin); + if (plugin.isEmptyFolderNoteFolder(folder)) { + addCSSClassToTitleEL(folder.path, 'only-has-folder-note', plugin); + } else { + removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); + } } export function addCSSClassToFolderNote(file: TFile, plugin: FolderNotesPlugin) { - addCSSClassToTitleEL(file.path, 'is-folder-note', plugin); + addCSSClassToTitleEL(file.path, 'is-folder-note', plugin); } export function removeCSSClassFromFolderNote(file: TFile, plugin: FolderNotesPlugin) { - removeCSSClassFromEL(file.path, 'is-folder-note', plugin); + removeCSSClassFromEL(file.path, 'is-folder-note', plugin); } export function removeCSSClassesFromFolder(folder: TFolder, plugin: FolderNotesPlugin) { - removeCSSClassFromEL(folder.path, 'has-folder-note', plugin); - removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); + removeCSSClassFromEL(folder.path, 'has-folder-note', plugin); + removeCSSClassFromEL(folder.path, 'only-has-folder-note', plugin); } export async function addCSSClassToTitleEL(path: string, cssClass: string, plugin: FolderNotesPlugin, waitForCreate = false, count = 0) { - const fileExplorerItem = getEl(path, plugin); - if (!fileExplorerItem) { - if (waitForCreate && count < 5) { - // sleep for a second for the file-explorer event to catch up - // this is annoying as in most scanarios our plugin recieves the event before file explorer - // If we could guarrantee load order it wouldn't be an issue but we can't - // realise this is racey and needs to be fixed. - await new Promise((r) => setTimeout(r, 500)); - addCSSClassToTitleEL(path, cssClass, plugin, waitForCreate, count + 1); - return; - } - return; - } - fileExplorerItem.addClass(cssClass); - const viewHeaderItems = document.querySelectorAll(`[data-path="${CSS.escape(path)}"]`); - viewHeaderItems.forEach((item) => { - item.addClass(cssClass); - }); + const fileExplorerItem = getEl(path, plugin); + if (!fileExplorerItem) { + if (waitForCreate && count < 5) { + // sleep for a second for the file-explorer event to catch up + // this is annoying as in most scanarios our plugin recieves the event before file explorer + // If we could guarrantee load order it wouldn't be an issue but we can't + // realise this is racey and needs to be fixed. + await new Promise((r) => setTimeout(r, 500)); + addCSSClassToTitleEL(path, cssClass, plugin, waitForCreate, count + 1); + return; + } + return; + } + fileExplorerItem.addClass(cssClass); + const viewHeaderItems = document.querySelectorAll(`[data-path='${CSS.escape(path)}']`); + viewHeaderItems.forEach((item) => { + item.addClass(cssClass); + }); } export function removeCSSClassFromEL(path: string | undefined, cssClass: string, plugin: FolderNotesPlugin) { - if (!path) return; - const fileExplorerItem = getEl(path, plugin); - const viewHeaderItems = document.querySelectorAll(`[data-path="${CSS.escape(path)}"]`); - viewHeaderItems.forEach((item) => { - item.removeClass(cssClass); - }); - if (!fileExplorerItem) { return; } - fileExplorerItem.removeClass(cssClass); + if (!path) return; + const fileExplorerItem = getEl(path, plugin); + const viewHeaderItems = document.querySelectorAll(`[data-path='${CSS.escape(path)}']`); + viewHeaderItems.forEach((item) => { + item.removeClass(cssClass); + }); + if (!fileExplorerItem) { return; } + fileExplorerItem.removeClass(cssClass); } export function getEl(path: string, plugin: FolderNotesPlugin): HTMLElement | null { - const fileExplorer = getFileExplorer(plugin); - if (!fileExplorer) { return null; } - if (!fileExplorer.view) { return null; } - if (!fileExplorer.view.fileItems) { return null; } - const fileExplorerItem = fileExplorer.view.fileItems[path]; - if (!fileExplorerItem) { return null; } - if (fileExplorerItem.selfEl) return fileExplorerItem.selfEl; - return fileExplorerItem.titleEl; + const fileExplorer = getFileExplorer(plugin); + if (!fileExplorer) { return null; } + if (!fileExplorer.view) { return null; } + if (!fileExplorer.view.fileItems) { return null; } + const fileExplorerItem = fileExplorer.view.fileItems[path]; + if (!fileExplorerItem) { return null; } + if (fileExplorerItem.selfEl) return fileExplorerItem.selfEl; + return fileExplorerItem.titleEl; } diff --git a/src/functions/utils.ts b/src/functions/utils.ts index e225d7e..37793f7 100644 --- a/src/functions/utils.ts +++ b/src/functions/utils.ts @@ -1,52 +1,52 @@ -import { TFile, TFolder } from "obsidian"; -import { FileExplorerWorkspaceLeaf } from "src/globals"; -import FolderNotesPlugin from "src/main"; -import { FileExplorerLeaf } from "obsidian-typings"; +import { TFile, TFolder } from 'obsidian'; +import { FileExplorerWorkspaceLeaf } from 'src/globals'; +import FolderNotesPlugin from 'src/main'; +import { FileExplorerLeaf } from 'obsidian-typings'; export function getFileNameFromPathString(path: string): string { - return path.substring(path.lastIndexOf('/') >= 0 ? path.lastIndexOf('/') + 1 : 0); + return path.substring(path.lastIndexOf('/') >= 0 ? path.lastIndexOf('/') + 1 : 0); } export function getFolderNameFromPathString(path: string): string { - if (path.endsWith('.md') || path.endsWith('.canvas')) { - return path.split('/').slice(-2)[0]; - } else { - return path.split('/').slice(-1)[0]; - } + if (path.endsWith('.md') || path.endsWith('.canvas')) { + return path.split('/').slice(-2)[0]; + } else { + return path.split('/').slice(-1)[0]; + } } export function removeExtension(name: string): string { - return name.replace(/\.[^/.]+$/, ''); + return name.replace(/\.[^/.]+$/, ''); } export function getExtensionFromPathString(path: string): string { - return path.slice(path.lastIndexOf('.') >= 0 ? path.lastIndexOf('.') : 0); + return path.slice(path.lastIndexOf('.') >= 0 ? path.lastIndexOf('.') : 0); } export function getFolderPathFromString(path: string): string { - const subString = path.lastIndexOf('/') >= 0 ? path.lastIndexOf('/') : 0; - const folderPath = path.substring(0, subString); - if (folderPath === '') { - return '/'; - } else { - return folderPath; - } + const subString = path.lastIndexOf('/') >= 0 ? path.lastIndexOf('/') : 0; + const folderPath = path.substring(0, subString); + if (folderPath === '') { + return '/'; + } else { + return folderPath; + } } export function getParentFolderPath(path: string): string { - return this.getFolderPathFromString(this.getFolderPathFromString(path)); + return this.getFolderPathFromString(this.getFolderPathFromString(path)); } export function getFileExplorer(plugin: FolderNotesPlugin) { - return plugin.app.workspace.getLeavesOfType('file-explorer')[0] as any as FileExplorerWorkspaceLeaf; + return plugin.app.workspace.getLeavesOfType('file-explorer')[0] as any as FileExplorerWorkspaceLeaf; } export function getFileExplorerView(plugin: FolderNotesPlugin) { - return getFileExplorer(plugin).view; + return getFileExplorer(plugin).view; } export function getFocusedItem(plugin: FolderNotesPlugin) { - const fileExplorer = getFileExplorer(plugin) as any as FileExplorerLeaf; - const focusedItem = fileExplorer.view.tree.focusedItem - return focusedItem; + const fileExplorer = getFileExplorer(plugin) as any as FileExplorerLeaf; + const focusedItem = fileExplorer.view.tree.focusedItem + return focusedItem; } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 4ab98cd..c8cf698 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,7 +16,7 @@ import './functions/ListComponent'; import { handleDelete } from './events/handleDelete'; import { addCSSClassToTitleEL, getEl, loadFileClasses } from './functions/styleFunctions'; import { getExcludedFolder } from './ExcludeFolders/functions/folderFunctions'; -import { ClipBoardManager, FileExplorerView, InternalPlugin } from 'obsidian-typings' +import { FileExplorerView, InternalPlugin } from 'obsidian-typings' import { getFocusedItem } from './functions/utils'; import { FOLDER_OVERVIEW_VIEW, FolderOverviewView } from './folderOverview/src/view'; import {getFolderPathFromString } from './functions/utils'; @@ -173,7 +173,7 @@ export default class FolderNotesPlugin extends Plugin { editMode.clipboardManager.constructor.prototype.handleDragOver = function (evt, ...args) { const { draggable } = plugin.app.dragManager; if (draggable && draggable.file instanceof TFolder && getFolderNote(plugin, draggable.file.path)) { - plugin.app.dragManager.setAction(window.i18next.t("interface.drag-and-drop.insert-link-here")); + plugin.app.dragManager.setAction(window.i18next.t('interface.drag-and-drop.insert-link-here')); } else { originalHandleDragOver.call(this, evt, ...args); } @@ -186,9 +186,9 @@ export default class FolderNotesPlugin extends Plugin { const { draggable } = plugin.app.dragManager; if (draggable && draggable.file instanceof TFolder && getFolderNote(plugin, draggable.file.path)) { const folderNote = getFolderNote(plugin, draggable.file.path); - if (draggable?.type === "folder" && draggable.file instanceof TFolder && folderNote) { + if (draggable?.type === 'folder' && draggable.file instanceof TFolder && folderNote) { draggable.file = folderNote; - draggable.type = "file"; + draggable.type = 'file'; } } return originalHandleDrop.call(this, evt, ...args); diff --git a/src/modals/AddSupportedFileType.ts b/src/modals/AddSupportedFileType.ts index 990b451..590a6a8 100644 --- a/src/modals/AddSupportedFileType.ts +++ b/src/modals/AddSupportedFileType.ts @@ -27,7 +27,7 @@ export default class AddSupportedFileModal extends Modal { }); contentEl.createEl('h2', { text: 'Extension name' }); new Setting(contentEl) - .setName('Enter the name of the extension (only the short form, e.g. "md")') + .setName('Enter the name of the extension (only the short form, e.g. 'md')') .addText((text) => text .setValue('') diff --git a/src/modals/AskForExtension.ts b/src/modals/AskForExtension.ts index 9ed1fc3..0c64566 100644 --- a/src/modals/AskForExtension.ts +++ b/src/modals/AskForExtension.ts @@ -1,6 +1,6 @@ -import { FuzzySuggestModal, Notice, TFile } from "obsidian"; -import FolderNotesPlugin from "src/main"; -import { createFolderNote } from "src/functions/folderNoteFunctions"; +import { FuzzySuggestModal, Notice, TFile } from 'obsidian'; +import FolderNotesPlugin from 'src/main'; +import { createFolderNote } from 'src/functions/folderNoteFunctions'; export class AskForExtensionModal extends FuzzySuggestModal { plugin: FolderNotesPlugin extension: string diff --git a/src/modals/ConfirmCreation.ts b/src/modals/ConfirmCreation.ts index 059142b..8ba8ab4 100644 --- a/src/modals/ConfirmCreation.ts +++ b/src/modals/ConfirmCreation.ts @@ -40,7 +40,7 @@ export default class ConfirmationModal extends Modal { .setDesc('Choose the file extension for the folder notes.') .addDropdown((cb) => { this.plugin.settings.supportedFileTypes.forEach((extension) => { - cb.addOption("." + extension, extension); + cb.addOption('.' + extension, extension); }); cb.setValue(this.extension); cb.onChange(async (value) => { diff --git a/src/modals/DeleteConfirmation.ts b/src/modals/DeleteConfirmation.ts index f6cf756..54ad929 100644 --- a/src/modals/DeleteConfirmation.ts +++ b/src/modals/DeleteConfirmation.ts @@ -17,13 +17,13 @@ export default class DeleteConfirmationModal extends Modal { const modalTitle = contentEl.createDiv({ cls: 'fn-modal-title' }); const modalContent = contentEl.createDiv({ cls: 'fn-modal-content' }); modalTitle.createEl('h2', { text: 'Delete folder note' }); - modalContent.createEl('p', { text: `Are you sure you want to delete the folder note "${this.file.name}" ?` }); + modalContent.createEl('p', { text: `Are you sure you want to delete the folder note '${this.file.name}' ?` }); switch (plugin.settings.deleteFilesAction) { case 'trash': modalContent.createEl('p', { text: 'It will be moved to your system trash.' }); break; case 'obsidianTrash': - modalContent.createEl('p', { text: 'It will be moved to your Obsidian trash, which is located in the ".trash" hidden folder in your vault.' }); + modalContent.createEl('p', { text: 'It will be moved to your Obsidian trash, which is located in the '.trash' hidden folder in your vault.' }); break; case 'delete': modalContent.createEl('p', { text: 'It will be permanently deleted.' }).setCssStyles({ color: 'red' }); diff --git a/src/settings/ExcludedFoldersSettings.ts b/src/settings/ExcludedFoldersSettings.ts index 6e595cd..ef463cb 100644 --- a/src/settings/ExcludedFoldersSettings.ts +++ b/src/settings/ExcludedFoldersSettings.ts @@ -2,7 +2,7 @@ import { addExcludeFolderListItem, addExcludedFolder } from 'src/ExcludeFolders/ import { ExcludedFolder } from 'src/ExcludeFolders/ExcludeFolder'; import { addExcludePatternListItem } from 'src/ExcludeFolders/functions/patternFunctions'; import { Setting } from 'obsidian'; -import { SettingsTab } from "./SettingsTab"; +import { SettingsTab } from './SettingsTab'; import ExcludedFolderSettings from 'src/ExcludeFolders/modals/ExcludeFolderSettings'; import PatternSettings from 'src/ExcludeFolders/modals/PatternSettings'; import WhitelistedFoldersSettings from 'src/ExcludeFolders/modals/WhitelistedFoldersSettings'; diff --git a/src/settings/FileExplorerSettings.ts b/src/settings/FileExplorerSettings.ts index 2ecf89a..5fae1c9 100644 --- a/src/settings/FileExplorerSettings.ts +++ b/src/settings/FileExplorerSettings.ts @@ -1,5 +1,5 @@ -import { Setting } from "obsidian"; -import { SettingsTab } from "./SettingsTab"; +import { Setting } from 'obsidian'; +import { SettingsTab } from './SettingsTab'; export async function renderFileExplorer(settingsTab: SettingsTab) { const containerEl = settingsTab.settingsPage; diff --git a/src/settings/FolderOverviewSettings.ts b/src/settings/FolderOverviewSettings.ts index e2a2e9e..4c5f9e0 100644 --- a/src/settings/FolderOverviewSettings.ts +++ b/src/settings/FolderOverviewSettings.ts @@ -1,9 +1,9 @@ -import { PluginSettingTab, Setting, TFolder } from "obsidian"; -import { SettingsTab } from "./SettingsTab"; +import { PluginSettingTab, Setting, TFolder } from 'obsidian'; +import { SettingsTab } from './SettingsTab'; import { ListComponent } from 'src/functions/ListComponent'; import { includeTypes } from 'src/folderOverview/src/FolderOverview'; -import { FolderSuggest } from "src/suggesters/FolderSuggester"; -import { createOverviewSettings } from "src/folderOverview/src/settings"; +import { FolderSuggest } from 'src/suggesters/FolderSuggester'; +import { createOverviewSettings } from 'src/folderOverview/src/settings'; export async function renderFolderOverview(settingsTab: SettingsTab) { const { plugin } = settingsTab; diff --git a/src/settings/GeneralSettings.ts b/src/settings/GeneralSettings.ts index 68afa80..d8848b8 100644 --- a/src/settings/GeneralSettings.ts +++ b/src/settings/GeneralSettings.ts @@ -1,11 +1,11 @@ -import { Setting, Platform, SettingTab } from "obsidian"; -import { SettingsTab } from "./SettingsTab"; +import { Setting, Platform, SettingTab } from 'obsidian'; +import { SettingsTab } from './SettingsTab'; import { ListComponent } from '../functions/ListComponent'; import AddSupportedFileModal from '../modals/AddSupportedFileType'; import { FrontMatterTitlePluginHandler } from '../events/FrontMatterTitle'; -import ConfirmationModal from "../modals/ConfirmCreation"; +import ConfirmationModal from '../modals/ConfirmCreation'; import { TemplateSuggest } from '../suggesters/TemplateSuggester'; -import { loadFileClasses } from "../functions/styleFunctions"; +import { loadFileClasses } from '../functions/styleFunctions'; export async function renderGeneral(settingsTab: SettingsTab) { const containerEl = settingsTab.settingsPage; @@ -36,7 +36,7 @@ export async function renderGeneral(settingsTab: SettingsTab) { if (settingsTab.plugin.settings.newFolderNoteName !== '{{folder_name}}') { new Setting(containerEl) .setName('Use folder name instead of folder note name in the tab title') - .setDesc('When you\'re using a folder note name like "folder note" and have multiple folder notes open you can\'t separate them anymore by their name. This setting uses the folder name instead and allows you to indentify the different files.') + .setDesc('When you\'re using a folder note name like 'folder note' and have multiple folder notes open you can\'t separate them anymore by their name. This setting uses the folder name instead and allows you to indentify the different files.') .addToggle((toggle) => toggle .setValue(settingsTab.plugin.settings.tabManagerEnabled) diff --git a/src/settings/PathSettings.ts b/src/settings/PathSettings.ts index 0a2be77..93d3fd1 100644 --- a/src/settings/PathSettings.ts +++ b/src/settings/PathSettings.ts @@ -1,5 +1,5 @@ -import { Setting } from "obsidian"; -import { SettingsTab } from "./SettingsTab"; +import { Setting } from 'obsidian'; +import { SettingsTab } from './SettingsTab'; export async function renderPath(settingsTab: SettingsTab) { const containerEl = settingsTab.settingsPage; new Setting(containerEl)