Change to open links in default browser

This commit is contained in:
kPherox 2019-04-08 04:28:54 +09:00
parent 77acfb47b3
commit d3a11b0e4c
No known key found for this signature in database
GPG Key ID: C04751C2BFA2F62D

View File

@ -40,7 +40,6 @@ protocol.registerStandardSchemes(['app'], { secure: true })
async function createWindow(windowName, loadPath, windowOptions, singleton, lastAction, openDevTools) { async function createWindow(windowName, loadPath, windowOptions, singleton, lastAction, openDevTools) {
if (typeof windows[windowName] !== 'undefined') { if (typeof windows[windowName] !== 'undefined') {
windows[windowName].show() windows[windowName].show()
windows[windowName].focus()
return return
} }
@ -60,10 +59,23 @@ async function createWindow(windowName, loadPath, windowOptions, singleton, last
windows[windowName] = undefined windows[windowName] = undefined
}) })
let openUrl = (event, url) => {
if (url === process.env.WEBPACK_DEV_SERVER_URL + loadPath) {
return
}
event.preventDefault()
shell.openExternal(url, {
activate: false
}, (err) => {
if (err) console.log(err)
})
}
win.webContents.on('will-navigate', openUrl)
win.webContents.on('new-window', openUrl)
if (process.env.WEBPACK_DEV_SERVER_URL) { if (process.env.WEBPACK_DEV_SERVER_URL) {
// `electron:serve`で起動した時の読み込み // `electron:serve`で起動した時の読み込み
win.loadURL(process.env.WEBPACK_DEV_SERVER_URL + loadPath) win.loadURL(process.env.WEBPACK_DEV_SERVER_URL + loadPath)
if (openDevTools) win.webContents.openDevTools()
} else { } else {
// ビルドしたアプリでの読み込み // ビルドしたアプリでの読み込み
if (!createdAppProtocol) { if (!createdAppProtocol) {
@ -73,6 +85,8 @@ async function createWindow(windowName, loadPath, windowOptions, singleton, last
win.loadURL(`app://./${loadPath}`) win.loadURL(`app://./${loadPath}`)
} }
if (isDevelopment && openDevTools) win.webContents.openDevTools()
lastAction(win) lastAction(win)
windows[windowName] = win windows[windowName] = win