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

Merge branch 'master' into SDA-2209

Browse Source
This commit is contained in:
mattias-symphony 2020-06-25 07:51:23 +02:00 committed by GitHub
commit 93114a42eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/main.ts
View File

@ -17,7 +17,9 @@ import { ICustomBrowserWindow, windowHandler } from './window-handler';
// Set automatic period substitution to false because of a bug in draft js on the client app
// See https://perzoinc.atlassian.net/browse/SDA-2215 for more details
systemPreferences.setUserDefault('NSAutomaticPeriodSubstitutionEnabled', 'string', 'false');
if (isMac) {
systemPreferences.setUserDefault('NSAutomaticPeriodSubstitutionEnabled', 'string', 'false');
}
logger.info(`App started with the args ${JSON.stringify(process.argv)}`);

1
src/app/window-handler.ts
View File

@ -1277,6 +1277,7 @@ export class WindowHandler {
default:
this.url = this.globalConfig.url + `?x-km-csrf-token=${csrfToken}`;
}
this.execCmd(this.screenShareIndicatorFrameUtil, []);
await this.mainWindow.loadURL(this.url);
} catch (e) {
logger.error(`window-handler: failed to switch client because of error ${e}`);

2
src/app/window-utils.ts
View File

@ -83,6 +83,8 @@ export const preventWindowNavigation = (browserWindow: BrowserWindow, isPopOutWi
logger.info(`window-utils: received ${response} response from dialog`);
}
}
windowHandler.execCmd(windowHandler.screenShareIndicatorFrameUtil, []);
}
if (browserWindow.isDestroyed()