if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-29 02:11:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from VishwasShashidhar/electron-135

Browse Source 
Electron 135: Pop out window -> url opens in external browser
This commit is contained in:
Vikas Shashidhar 2017-10-09 15:40:45 +05:30 committed by GitHub
commit 31b9072793
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
js/windowMgr.js
View File

@ -250,17 +250,7 @@ function doCreateMainWindow(initialUrl, initialBounds) {
webContents.send('downloadCompleted', data); webContents.send('downloadCompleted', data);
} }
}); });
}); });
// bug in electron is preventing this from working in sandboxed evt...
// https://github.com/electron/electron/issues/8841
mainWindow.webContents.on('will-navigate', function(event, willNavUrl) {
if (!sandboxed) {
return;
}
event.preventDefault();
openUrlInDefaultBrower(willNavUrl);
});
// open external links in default browser - a tag with href='_blank' or window.open // open external links in default browser - a tag with href='_blank' or window.open
mainWindow.webContents.on('new-window', function (event, newWinUrl, mainWindow.webContents.on('new-window', function (event, newWinUrl,
@ -341,13 +331,22 @@ function doCreateMainWindow(initialUrl, initialBounds) {
browserWin.winName = frameName; browserWin.winName = frameName;
browserWin.setAlwaysOnTop(alwaysOnTop); browserWin.setAlwaysOnTop(alwaysOnTop);
browserWin.once('closed', function () { let handleChildWindowClosed = () => {
removeWindowKey(newWinKey); removeWindowKey(newWinKey);
browserWin.removeListener('move', throttledBoundsChange); browserWin.removeListener('move', throttledBoundsChange);
browserWin.removeListener('resize', throttledBoundsChange); browserWin.removeListener('resize', throttledBoundsChange);
};
browserWin.once('closed', () => {
handleChildWindowClosed();
}); });
browserWin.webContents.on('crashed', function () { browserWin.on('close', () => {
browserWin.webContents.removeListener('new-window', handleChildNewWindowEvent);
browserWin.webContents.removeListener('crashed', handleChildWindowCrashEvent);
});
let handleChildWindowCrashEvent = () => {
const options = { const options = {
type: 'error', type: 'error',
title: 'Renderer Process Crashed', title: 'Renderer Process Crashed',
@ -357,13 +356,25 @@ function doCreateMainWindow(initialUrl, initialBounds) {
electron.dialog.showMessageBox(options, function (index) { electron.dialog.showMessageBox(options, function (index) {
if (index === 0) { if (index === 0) {
mainWindow.reload(); browserWin.reload();
} }
else { else {
mainWindow.close(); browserWin.close();
} }
}); });
}); };
browserWin.webContents.on('crashed', handleChildWindowCrashEvent);
let handleChildNewWindowEvent = (childEvent, childWinUrl) => {
childEvent.preventDefault();
openUrlInDefaultBrowser(childWinUrl);
};
// In case we navigate to an external link from inside a pop-out,
// we open that link in an external browser rather than creating
// a new window
browserWin.webContents.on('new-window', handleChildNewWindowEvent);
addWindowKey(newWinKey, browserWin); addWindowKey(newWinKey, browserWin);
@ -381,7 +392,7 @@ function doCreateMainWindow(initialUrl, initialBounds) {
}); });
} else { } else {
event.preventDefault(); event.preventDefault();
openUrlInDefaultBrower(newWinUrl) openUrlInDefaultBrowser(newWinUrl);
} }
}); });
@ -477,7 +488,7 @@ function setIsOnline(status) {
} }
/** /**
* Tries finding a window we have created with given name. If founds then * Tries finding a window we have created with given name. If found, then
* brings to front and gives focus. * brings to front and gives focus.
* @param {String} windowName Name of target window. Note: main window has * @param {String} windowName Name of target window. Note: main window has
* name 'main'. * name 'main'.
@ -523,8 +534,8 @@ function sendChildWinBoundsChange(window) {
* Opens an external url in the system's default browser * Opens an external url in the system's default browser
* @param urlToOpen * @param urlToOpen
*/ */
function openUrlInDefaultBrower(urlToOpen) { function openUrlInDefaultBrowser(urlToOpen) {
if (urlToOpen) { if (urlToOpen) {
electron.shell.openExternal(urlToOpen); electron.shell.openExternal(urlToOpen);
} }
} }