diff --git a/instance/main.js b/instance/main.js index 239e7cc6fd76b55be57bbb18692506f28893ddcd..180d07fb0e65bfe60224d851ea3370c7d610fe58 100644 --- a/instance/main.js +++ b/instance/main.js @@ -205,6 +205,14 @@ ipcRenderer.on('send-runnings', (event, arg) => { $('#running-klkt').prop('checked', arg.klkt); }); +ipcRenderer.on('send-lektord-is-attached', (event, arg) => { + logger.debug('instance', `Lektord is in attached mode? ${arg}`); +}); + +/* + * Drag'n'drop functions + */ + function addDBKaraEventHandlers(element) { element.addEventListener('dragstart', onDragStartDB, false); element.addEventListener('dragend', onDragEnd, false); diff --git a/main.js b/main.js index 46fc4897928c0a4cc62626344099882460282ac5..357ac08b9c0e0aa7857a6caa7e19956b130608ed 100644 --- a/main.js +++ b/main.js @@ -92,7 +92,6 @@ function createInstanceWindow() { }, }); win.loadURL(`file://${__dirname}/instance/index.ejs`); - // win.loadFile('instance/index.html'); } function createUserViewWindow() { @@ -155,9 +154,28 @@ app.on('quit', () => { app.on('ready', () => { logger.info('main', 'Main window is ready'); - createInstanceWindow(); client = fork('client/main.js'); lektor = new Lektor(); + createInstanceWindow(); + + win.webContents.on('did-finish-load', () => { + logger.debug('main', 'webContents got "did-finish-load"'); + win.webContents.send('send-lektord-is-attached', lektor.attached); + win.webContents.on('console-message', (event, level, message, line, sourceId) => { + switch (level) { + case 0: + logger.debug('console-instance', `[${sourceId}+${line}] ${message.replace(/\n|\r/g, '')}`); + break; + case 1: + logger.warn('console-instance', `[${sourceId}+${line}] ${message.replace(/\n|\r/g, '')}`); + break; + case 2: + default: + logger.error('console-instance', `[${sourceId}+${line}] ${message.replace(/\n|\r/g, '')}`); + break; + } + }); + }); globalShortcut.register('CommandOrControl+D', () => { var win = BrowserWindow.getFocusedWindow(); diff --git a/package.json b/package.json index 40aaa64f365d4b9870f274735cbac1719f00f527..8f06963896305ee3aab1960ec432742b077c4d4c 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ ], "license": "ISC", "scripts": { - "start": "ELECTRON_ENABLE_LOGGING=0 ELECTRON_NO_ATTACH_CONSOLE=true electron --trace-uncaught ." + "start": "electron --trace-uncaught ." }, "dependencies": { "ejs": "^3.1.5",