diff --git a/src/public/app/services/glob.js b/src/public/app/services/glob.ts similarity index 98% rename from src/public/app/services/glob.js rename to src/public/app/services/glob.ts index f523a677e..e5f9e744d 100644 --- a/src/public/app/services/glob.js +++ b/src/public/app/services/glob.ts @@ -27,7 +27,7 @@ function setupGlobs() { window.glob.importMarkdownInline = async () => appContext.triggerCommand("importMarkdownInline"); window.onerror = function (msg, url, lineNo, columnNo, error) { - const string = msg.toLowerCase(); + const string = String(msg).toLowerCase(); let message = "Uncaught error: "; diff --git a/src/public/app/services/utils.ts b/src/public/app/services/utils.ts index 6e2937beb..47bc2c1e9 100644 --- a/src/public/app/services/utils.ts +++ b/src/public/app/services/utils.ts @@ -350,7 +350,7 @@ function openHelp($button: JQuery) { } } -function initHelpButtons($el: JQuery) { +function initHelpButtons($el: JQuery | JQuery) { // for some reason, the .on(event, listener, handler) does not work here (e.g. Options -> Sync -> Help button) // so we do it manually $el.on("click", e => { diff --git a/src/public/app/types.d.ts b/src/public/app/types.d.ts index 14cc2c19a..6e2f57ccf 100644 --- a/src/public/app/types.d.ts +++ b/src/public/app/types.d.ts @@ -3,6 +3,9 @@ import type { BackendModule, i18n } from "i18next"; import type { Froca } from "./services/froca-interface"; import type { HttpBackendOptions } from "i18next-http-backend"; import { Suggestion } from "./services/note_autocomplete.ts"; +import utils from "./services/utils.ts"; +import appContext from "./components/app_context.ts"; +import server from "./services/server.ts"; interface ElectronProcess { type: string; @@ -10,11 +13,11 @@ interface ElectronProcess { } interface CustomGlobals { - isDesktop: boolean; - isMobile: boolean; + isDesktop: typeof utils.isDesktop; + isMobile: typeof utils.isMobile; device: "mobile" | "desktop"; - getComponentsByEl: (el: unknown) => unknown; - getHeaders: Promise>; + getComponentByEl: typeof appContext.getComponentByEl; + getHeaders: typeof server.getHeaders; getReferenceLinkTitle: (href: string) => Promise; getReferenceLinkTitleSync: (href: string) => string; getActiveContextNote: FNote; @@ -36,6 +39,7 @@ interface CustomGlobals { maxEntityChangeSyncIdAtLoad: number; assetPath: string; instanceName: string; + appCssNoteIds: string[]; } type RequireMethod = (moduleName: string) => any;