refactor: update to use obsidian api for platform detection

aidenlx · Sep 13, 2021 · f1ed456 · f1ed456
1 parent 763adad
commit f1ed456
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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)