gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Remove will-navigate comment after Electron fix" 

This reverts commit 749d7e8e4c.
This commit is contained in:
J. Ryan Stinnett 2020-02-28 11:42:08 +00:00 committed by Travis Ralston
parent 706834939f
commit 2a5438d636
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
electron_app/src/webcontents-handler.js
View File

@ -174,6 +174,18 @@ function onEditableContextMenu(ev, params) {
module.exports = (webContents) => { module.exports = (webContents) => {
webContents.on('new-window', onWindowOrNavigate); webContents.on('new-window', onWindowOrNavigate);
// XXX: The below now does absolutely nothing because of
// https://github.com/electron/electron/issues/8841
// Whilst this isn't a security issue since without
// node integration and with the sandbox, it should be
// no worse than opening the site in Chrome, it obviously
// means the user has to restart Riot to make it usable
// again (often unintuitive because it minimises to the
// system tray). We therefore need to be vigilant about
// putting target="_blank" on links in Riot (although
// we should generally be doing this anyway since links
// navigating you away from Riot in the browser is
// also annoying).
webContents.on('will-navigate', onWindowOrNavigate); webContents.on('will-navigate', onWindowOrNavigate);
webContents.on('context-menu', function(ev, params) { webContents.on('context-menu', function(ev, params) {