Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 03:16:11 +01:00
Code Issues Packages Projects Releases Activity

fix: skipLibCheck

Browse Source
This commit is contained in:
Alex
2024-05-01 11:32:08 +02:00
parent d2604e91d4
commit 3e82d30a32
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
electron.ts
View File

@@ -1,10 +1,10 @@
"use strict";
const { app, globalShortcut, BrowserWindow } = require("electron");
const sqlInit = require("./src/services/sql_init");
const appIconService = require("./src/services/app_icon.js");
const windowService = require("./src/services/window");
const tray = require("./src/services/tray");
import electron = require("electron");
import sqlInit = require("./src/services/sql_init");
import appIconService = require("./src/services/app_icon");
import windowService = require("./src/services/window");
import tray = require("./src/services/tray");
// Adds debug features like hotkeys for triggering dev tools and reload
require("electron-debug")();
@@ -14,31 +14,33 @@ appIconService.installLocalAppIcon();
require("electron-dl")({ saveAs: true });
// needed for excalidraw export https://github.com/zadam/trilium/issues/4271
app.commandLine.appendSwitch("enable-experimental-web-platform-features");
electron.app.commandLine.appendSwitch(
"enable-experimental-web-platform-features"
);
// Quit when all windows are closed, except on macOS. There, it's common
// for applications and their menu bar to stay active until the user quits
// explicitly with Cmd + Q.
app.on("window-all-closed", () => {
electron.app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
app.quit();
electron.app.quit();
}
});
app.on("ready", async () => {
// app.setAppUserModelId('com.github.zadam.trilium');
electron.app.on("ready", async () => {
// electron.app.setAppUserModelId('com.github.zadam.trilium');
// if db is not initialized -> setup process
// if db is initialized, then we need to wait until the migration process is finished
if (sqlInit.isDbInitialized()) {
await sqlInit.dbReady;
await windowService.createMainWindow(app);
await windowService.createMainWindow(electron.app);
if (process.platform === "darwin") {
app.on("activate", async () => {
if (BrowserWindow.getAllWindows().length === 0) {
await windowService.createMainWindow(app);
electron.app.on("activate", async () => {
if (electron.BrowserWindow.getAllWindows().length === 0) {
await windowService.createMainWindow(electron.app);
}
});
}
@@ -51,8 +53,8 @@ app.on("ready", async () => {
await windowService.registerGlobalShortcuts();
});
app.on("will-quit", () => {
globalShortcut.unregisterAll();
electron.app.on("will-quit", () => {
electron.globalShortcut.unregisterAll();
});
// this is to disable electron warning spam in the dev console (local development only)