if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-01-03 12:47:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #940 from KiranNiranjan/SDA-1877

Browse Source 
fix: SDA-1877 (Fix blank pop-out issue in 8.x electron version)
This commit is contained in:
Johan Kwarnmark 2020-03-23 14:50:49 +01:00 committed by GitHub
commit 51751b9e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,7 +32,7 @@
"start": "run-s compile browserify && cross-env ELECTRON_DEV=true electron .",
"test": "run-s lint test:unit",
"test:unit": "cross-env ELECTRON_QA=true jest --config jest-config.json --runInBand --detectOpenHandles",
"test:spectron": "npm run copy && run-s lint compile browserify && npx ava --verbose --serial",
"test:spectron": "npm run copy && run-s lint compile browserify && cross-env ELECTRON_QA=true npx ava --verbose --serial",
"copy": "run-os",
"copy:darwin": "ncp config 'node_modules/electron/dist/Electron.app/Contents/config'",
"copy:win32": "ncp config node_modules\\electron\\dist\\config",

8
src/app/main.ts
View File

@ -2,7 +2,7 @@ import { app } from 'electron';
import * as electronDownloader from 'electron-dl';
import * as shellPath from 'shell-path';
import { isDevEnv, isLinux, isMac } from '../common/env';
import { isDevEnv, isElectronQA, isLinux, isMac } from '../common/env';
import { logger } from '../common/logger';
import { getCommandLineArgs } from '../common/utils';
import { cleanUpAppCache, createAppCacheFile } from './app-cache-handler';
@ -49,6 +49,12 @@ electronDownloader();
handlePerformanceSettings();
setChromeFlags();
// Need this to prevent blank pop-out from 8.x versions
// Refer - SDA-1877 - https://github.com/electron/electron/issues/18397
if (!isElectronQA) {
app.allowRendererProcessReuse = true;
}
// Electron sets the default protocol
if (!isDevEnv) {
app.setAsDefaultProtocolClient('symphony');