Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-23 07:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2023-03-07 11:03:22 +08:00
commit f740842e41
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/electron/main.js
View file

@ -192,6 +192,7 @@ const boot = () => {
webviewTag: true, webviewTag: true,
webSecurity: false, webSecurity: false,
contextIsolation: false, contextIsolation: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
}, },
frame: "darwin" === process.platform, frame: "darwin" === process.platform,
titleBarStyle: "hidden", titleBarStyle: "hidden",
@ -751,6 +752,7 @@ app.whenReady().then(() => {
nodeIntegration: true, nodeIntegration: true,
webviewTag: true, webviewTag: true,
webSecurity: false, webSecurity: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
}, },
}); });
win.loadURL(data.url); win.loadURL(data.url);

1
app/src/protyle/export/index.ts
View file

@ -468,6 +468,7 @@ const renderPDF = (id: string) => {
nodeIntegration: true, nodeIntegration: true,
webviewTag: true, webviewTag: true,
webSecurity: false, webSecurity: false,
autoplayPolicy: 'user-gesture-required' // 桌面端禁止自动播放多媒体 https://github.com/siyuan-note/siyuan/issues/7587
}, },
}); });
ipcRenderer.send(Constants.SIYUAN_EXPORT_PREVENT, window.siyuan.printWin.id); ipcRenderer.send(Constants.SIYUAN_EXPORT_PREVENT, window.siyuan.printWin.id);