if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

ELECTRON-1050: fix issue where we were opening new window for same pod url (#577)

Browse Source
This commit is contained in:
Vishwas Shashidhar 2019-03-04 19:04:35 +05:30 committed by GitHub
parent ae508da377
commit b40c2787bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/windowMgr.js
View File

@ -454,7 +454,17 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
let emptyUrlString = 'about:blank'; let emptyUrlString = 'about:blank';
let dispositionWhitelist = ['new-window', 'foreground-tab']; let dispositionWhitelist = ['new-window', 'foreground-tab'];
// only allow window.open to succeed is if coming from same hsot, let fullMainUrl = `${mainWinParsedUrl.protocol}//${mainWinParsedUrl.host}/`;
// If the main url and new window url are the same,
// we open that in a browser rather than a separate window
if (newWinUrl === fullMainUrl) {
event.preventDefault();
openUrlInDefaultBrowser(newWinUrl);
return;
}
// only allow window.open to succeed is if coming from same host,
// otherwise open in default browser. // otherwise open in default browser.
if ((newWinHost === mainWinHost || newWinUrl === emptyUrlString) && dispositionWhitelist.includes(disposition)) { if ((newWinHost === mainWinHost || newWinUrl === emptyUrlString) && dispositionWhitelist.includes(disposition)) {
// handle: window.open // handle: window.open