mirror of
https://github.com/finos/SymphonyElectron.git
synced 2025-02-25 18:55:29 -06:00
Merge branch 'master' into SDA-2209
This commit is contained in:
commit
93114a42eb
@ -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)}`);
|
||||
|
||||
|
@ -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}`);
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user