From f1ed456b45b86ab568c937f37e81a7fb876bc173 Mon Sep 17 00:00:00 2001 From: AidenLx Date: Mon, 13 Sep 2021 11:13:54 +0800 Subject: [PATCH] refactor: update to use obsidian api for platform detection --- src/misc.ts | 5 ++--- src/settings.ts | 14 ++++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/misc.ts b/src/misc.ts index d00d7db..519b188 100644 --- a/src/misc.ts +++ b/src/misc.ts @@ -3,6 +3,7 @@ import { AFItem, FolderItem, Modifier, + Platform, TAbstractFile, TFile, TFolder, @@ -21,8 +22,6 @@ export const isFolder = (item: AFItem): item is FolderItem => export const isMd = (file: TFile | string) => typeof file === "string" ? extname(file) === ".md" : file.extension === "md"; -export const isMac = () => navigator.userAgent.includes("Macintosh"); - export enum NoteLoc { Index, Inside, @@ -33,7 +32,7 @@ export const isModifier = (evt: MouseEvent, pref: Modifier): boolean => { const { altKey, metaKey, ctrlKey, shiftKey } = evt; switch (pref) { case "Mod": - return isMac() ? metaKey : ctrlKey; + return Platform.isMacOS ? metaKey : ctrlKey; case "Ctrl": return ctrlKey; case "Meta": diff --git a/src/settings.ts b/src/settings.ts index 21d8a0c..4d4e74c 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,8 +1,14 @@ -import { App, debounce, Modifier, PluginSettingTab, Setting } from "obsidian"; +import { + App, + debounce, + Modifier, + Platform, + PluginSettingTab, + Setting, +} from "obsidian"; import ALxFolderNote from "./fn-main"; -import { isMac, NoteLoc } from "./misc"; -import FEHandler from "./modules/fe-handler"; +import { NoteLoc } from "./misc"; export const noHideMark = "alx-no-hide-note"; @@ -125,7 +131,7 @@ export class ALxFolderNoteSettingTab extends PluginSettingTab { Alt: "⌥ Option", }; - const options = isMac() ? macOSOpts : windowsOpts; + const options = Platform.isMacOS ? macOSOpts : windowsOpts; dropDown .addOptions(options)