Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-03 19:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-06-06 21:54:58 +08:00
commit dd69fa26a7
4 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/electron/main.js
View file

@ -119,8 +119,10 @@ const exitApp = (port, errorWindowId) => {
}
};
const localServer = "http://127.0.0.1"
const getServer = (port = kernelPort) => {
return "http://127.0.0.1:" + port;
return localServer + ":" + port;
};
const sleep = (ms) => {
@ -359,16 +361,13 @@ const boot = () => {
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
// 当前页面链接使用浏览器打开
currentWindow.webContents.on("will-navigate", (event, url) => {
if (event.sender) {
const currentURL = new URL(event.sender.getURL());
if (url.startsWith(getServer(currentURL.port))) {
return;
}
event.preventDefault();
shell.openExternal(url);
currentWindow.webContents.on("will-navigate", (event) => {
const url = event.url;
event.preventDefault();
if (url.startsWith(localServer)) {
return;
}
shell.openExternal(url);
});
currentWindow.on("close", (event) => {
@ -664,10 +663,10 @@ app.whenReady().then(() => {
BrowserWindow.fromId(id).webContents.send("siyuan-export-close", id);
});
ipcMain.on("siyuan-export-prevent", (event, id) => {
BrowserWindow.fromId(id).webContents.on("will-navigate", (event, url) => {
const currentURL = new URL(event.sender.getURL());
BrowserWindow.fromId(id).webContents.on("will-navigate", (event) => {
const url = event.url;
event.preventDefault();
if (url.startsWith(getServer(currentURL.port))) {
if (url.startsWith(localServer)) {
return;
}
shell.openExternal(url);