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' of github.com:symphonyoss/SymphonyElectron

Browse Source
This commit is contained in:
Vishwas Shashidhar 2020-05-14 16:44:36 +05:30
commit 1d0818490a
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -17746,8 +17746,8 @@
} }
}, },
"screen-share-indicator-frame": { "screen-share-indicator-frame": {
"version": "1.4.7", "version": "1.4.8",
"resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#91f72807c2e067abf39f5eab32e3fba3f3961a92", "resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#c48f25a170fbf18361d109e58d391d105ca7efc5",
"optional": true, "optional": true,
"requires": { "requires": {
"run-script-os": "1.0.7" "run-script-os": "1.0.7"

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

@ -460,8 +460,21 @@ export class WindowHandler {
return; return;
} }
if (this.url.indexOf('welcome')) { if (this.url.indexOf('welcome')) {
this.mainWindow.webContents.send('page-load-welcome', { locale: i18n.getLocale(), resource: i18n.loadedResources }); this.mainWindow.webContents.send('page-load-welcome', {
this.mainWindow.webContents.send('welcome', { url: this.startUrl, message: '', urlValid: true, sso: false }); locale: i18n.getLocale(),
resource: i18n.loadedResources,
});
const userConfigUrl = this.userConfig.url
&& this.userConfig.url.indexOf('/login/sso/initsso') > -1 ?
this.userConfig.url.slice(0, this.userConfig.url.indexOf('/login/sso/initsso'))
: this.userConfig.url;
this.mainWindow.webContents.send('welcome', {
url: userConfigUrl || this.startUrl,
message: '',
urlValid: true,
sso: false,
});
} }
}); });

4
src/renderer/preload-main.ts
View File

@ -156,8 +156,8 @@ ipcRenderer.on('page-load', (_event, { locale, resources, enableCustomTitleBar }
ipcRenderer.on('page-load-welcome', (_event, data) => { ipcRenderer.on('page-load-welcome', (_event, data) => {
const { locale, resource } = data; const { locale, resource } = data;
i18n.setResource(locale, resource); i18n.setResource(locale, resource);
// Renders component as soon as the page is ready
document.title = i18n.t('WelcomeText', 'Welcome')(); document.title = 'Welcome';
const styles = document.createElement('link'); const styles = document.createElement('link');
styles.rel = 'stylesheet'; styles.rel = 'stylesheet';
styles.type = 'text/css'; styles.type = 'text/css';