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

electron-17: fixes merge conflicts with master

Browse Source
This commit is contained in:
Vishwas Shashidhar 2017-10-09 19:57:38 +05:30
commit dd0882c0b6
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/aboutApp/index.js
View File

@ -44,6 +44,16 @@ function getTemplatePath() {
* which this window should show
*/
function openAboutWindow(windowName) {
// This prevents creating multiple instances of the
// about window
if (aboutWindow) {
if (aboutWindow.isMinimized()) {
aboutWindow.restore();
}
aboutWindow.focus();
return;
}
let allWindows = BrowserWindow.getAllWindows();
allWindows = allWindows.find((window) => { return window.winName === windowName });

53
js/windowMgr.js
View File

@ -266,17 +266,7 @@ function doCreateMainWindow(initialUrl, initialBounds) {
.catch((err) => {
log.send(logLevels.ERROR, 'Unable to initialize crash reporter in the main window. Error is -> ' + err);
});
}
// 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
mainWindow.webContents.on('new-window', function (event, newWinUrl,
@ -369,13 +359,22 @@ function doCreateMainWindow(initialUrl, initialBounds) {
browserWin.winName = frameName;
browserWin.setAlwaysOnTop(alwaysOnTop);
browserWin.once('closed', function () {
let handleChildWindowClosed = () => {
removeWindowKey(newWinKey);
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 = {
type: 'error',
title: 'Renderer Process Crashed',
@ -385,13 +384,25 @@ function doCreateMainWindow(initialUrl, initialBounds) {
electron.dialog.showMessageBox(options, function (index) {
if (index === 0) {
mainWindow.reload();
browserWin.reload();
}
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);
@ -409,7 +420,7 @@ function doCreateMainWindow(initialUrl, initialBounds) {
});
} else {
event.preventDefault();
openUrlInDefaultBrower(newWinUrl);
openUrlInDefaultBrowser(newWinUrl);
}
});
@ -505,7 +516,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.
* @param {String} windowName Name of target window. Note: main window has
* name 'main'.
@ -551,8 +562,8 @@ function sendChildWinBoundsChange(window) {
* Opens an external url in the system's default browser
* @param urlToOpen
*/
function openUrlInDefaultBrower(urlToOpen) {
if (urlToOpen) {
function openUrlInDefaultBrowser(urlToOpen) {
if (urlToOpen) {
electron.shell.openExternal(urlToOpen);
}
}

2
package.json
View File

@ -76,7 +76,7 @@
"devDependencies": {
"browserify": "^14.1.0",
"cross-env": "^3.2.4",
"electron": "1.7.5",
"electron": "1.7.8",
"electron-builder": "^13.9.0",
"electron-builder-squirrel-windows": "^12.3.0",
"electron-packager": "^8.5.2",