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

use correct event when browserWin finally closes (#60)

Browse Source
This commit is contained in:
Lynn 2017-04-18 13:40:26 -07:00 committed by GitHub
parent b2fcf1afc2
commit 7477437c6d
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/windowMgr.js
View File

@ -114,7 +114,7 @@ function createMainWindow(initialUrl) {
}); });
function destroyAllWindows() { function destroyAllWindows() {
var keys = Object.keys(windows); let keys = Object.keys(windows);
for(var i = 0, len = keys.length; i < len; i++) { for(var i = 0, len = keys.length; i < len; i++) {
let winKey = keys[i]; let winKey = keys[i];
removeWindowKey(winKey); removeWindowKey(winKey);
@ -143,8 +143,9 @@ function createMainWindow(initialUrl) {
// abort - no frame name provided. // abort - no frame name provided.
return; return;
} }
// reposition new window // reposition new window
var mainWinPos = mainWindow.getPosition(); let mainWinPos = mainWindow.getPosition();
if (mainWinPos && mainWinPos.length === 2) { if (mainWinPos && mainWinPos.length === 2) {
let newWinKey = getGuid(); let newWinKey = getGuid();
@ -155,19 +156,21 @@ function createMainWindow(initialUrl) {
newWinOptions.winKey = newWinKey; newWinOptions.winKey = newWinKey;
/* eslint-enable no-param-reassign */ /* eslint-enable no-param-reassign */
// note: will use code below later for saved layout impl. let webContents = newWinOptions.webContents;
var webContents = newWinOptions.webContents;
webContents.once('did-finish-load', function() {
var browserWin = electron.BrowserWindow.fromWebContents(webContents); webContents.once('did-finish-load', function() {
let browserWin = electron.BrowserWindow.fromWebContents(webContents);
if (browserWin) {
browserWin.winName = frameName; browserWin.winName = frameName;
addWindowKey(newWinKey, browserWin); browserWin.once('closed', function() {
browserWin.once('close', function() {
removeWindowKey(newWinKey); removeWindowKey(newWinKey);
}); });
addWindowKey(newWinKey, browserWin);
}
// note: will use later for save-layout feature // note: will use later for save-layout feature
// browserWin.on('move', function() { // browserWin.on('move', function() {
// var newPos = browserWin.getPosition(); // var newPos = browserWin.getPosition();
@ -215,10 +218,11 @@ function setIsOnline(status) {
} }
function activate(windowName) { function activate(windowName) {
var keys = Object.keys(windows); let keys = Object.keys(windows);
for(var i = 0, len = keys.length; i < len; i++) { for(let i = 0, len = keys.length; i < len; i++) {
var window = windows[keys[i]]; let window = windows[keys[i]];
if (window.winName === windowName) { if (window && !window.isDestroyed() &&
window.winName === windowName) {
window.show(); window.show();
return; return;
} }