From ffbfccb701902daf7d26375608644016248b2160 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 27 Apr 2020 22:29:39 +0200 Subject: [PATCH] extra window now works in browsers too --- package-lock.json | 6 +++--- package.json | 2 +- src/public/app/services/app_context.js | 4 ++-- src/services/window.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a305a9e6..ff5985ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3335,9 +3335,9 @@ } }, "electron": { - "version": "9.0.0-beta.18", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.18.tgz", - "integrity": "sha512-mOdPB4nPc4kO2uwpvvbNZz0RDrRDIko/C8XFmOZmz7k3JaU7r0h/tLxdeypiqfLwxW/Bu1n+uwqG1X34i3fTEw==", + "version": "9.0.0-beta.20", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.20.tgz", + "integrity": "sha512-B3JDQRGYi/hS/a64wDx1Xnl8Z52rpBbysh+D4KOKL95NJ+MLVifgCzhu9yHIFNblB5fqz7PFzbyllJ6wAoQMQg==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 5a929d021..eadbbaa3a 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "yazl": "^2.5.1" }, "devDependencies": { - "electron": "9.0.0-beta.18", + "electron": "9.0.0-beta.20", "electron-builder": "22.5.1", "electron-packager": "14.2.1", "electron-rebuild": "1.10.1", diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js index 62cbaa174..75c1c820c 100644 --- a/src/public/app/services/app_context.js +++ b/src/public/app/services/app_context.js @@ -108,9 +108,9 @@ class AppContext extends Component { ipcRenderer.send('create-extra-window', {notePath}); } else { - const url = 'http://127.0.0.1:37740/#' + notePath; + const url = window.location.protocol + '//' + window.location.host + window.location.pathname + '?extra=1#' + notePath; - window.open(url); + window.open(url, '', 'width=1000,height=800'); } } } diff --git a/src/services/window.js b/src/services/window.js index e7c0bc763..f9f2c8b78 100644 --- a/src/services/window.js +++ b/src/services/window.js @@ -18,8 +18,8 @@ let setupWindow; async function createExtraWindow(notePath) { const {BrowserWindow} = require('electron'); const win = new BrowserWindow({ - height: 600, - width: 800, + width: 1000, + height: 800, title: 'Trilium Notes', webPreferences: { enableRemoteModule: true,