mirror of
https://github.com/zadam/trilium.git
synced 2025-11-02 03:16:11 +01:00
Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3
This commit is contained in:
@@ -17,7 +17,7 @@ let setupWindow: BrowserWindow | null;
|
||||
async function createExtraWindow(extraWindowHash: string) {
|
||||
const spellcheckEnabled = optionService.getOptionBool('spellCheckEnabled');
|
||||
|
||||
const {BrowserWindow} = require('electron');
|
||||
const { BrowserWindow } = require('electron');
|
||||
|
||||
const win = new BrowserWindow({
|
||||
width: 1000,
|
||||
@@ -53,7 +53,7 @@ async function createMainWindow(app: App) {
|
||||
|
||||
const spellcheckEnabled = optionService.getOptionBool('spellCheckEnabled');
|
||||
|
||||
const {BrowserWindow} = require('electron'); // should not be statically imported
|
||||
const { BrowserWindow } = require('electron'); // should not be statically imported
|
||||
|
||||
mainWindow = new BrowserWindow({
|
||||
x: mainWindowState.x,
|
||||
@@ -128,7 +128,7 @@ function getIcon() {
|
||||
}
|
||||
|
||||
async function createSetupWindow() {
|
||||
const {BrowserWindow} = require('electron'); // should not be statically imported
|
||||
const { BrowserWindow } = require('electron'); // should not be statically imported
|
||||
setupWindow = new BrowserWindow({
|
||||
width: 800,
|
||||
height: 800,
|
||||
@@ -152,7 +152,7 @@ function closeSetupWindow() {
|
||||
}
|
||||
|
||||
async function registerGlobalShortcuts() {
|
||||
const {globalShortcut} = require('electron');
|
||||
const { globalShortcut } = require('electron');
|
||||
|
||||
await sqlInit.dbReady;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user