if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-25 10:20:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sda-2094

Browse Source
This commit is contained in:
Johan Kwarnmark 2020-06-04 09:06:17 +02:00 committed by GitHub
commit 75809c29a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.vscode/launch.json vendored
View File

@ -1,6 +1,26 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "dev",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": ["."],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
},
{
"name": "corp",
"type": "node",
@ -22,7 +42,27 @@
]
},
{
"name": "corp",
"name": "mana",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [".", "--url=https://local-dev.symphony.com:9090"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
}
{
"name": "demo",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",

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

@ -181,7 +181,7 @@ export class WindowHandler {
this.url = WindowHandler.getValidUrl(this.userConfig.url ? this.userConfig.url : this.globalConfig.url);
logger.info(`window-handler: setting url ${this.url} from config file!`);
if (config.isFirstTimeLaunch()) {
if (config.isFirstTimeLaunch() && this.globalConfig.url.indexOf('https://my.symphony.com') >= 0) {
this.shouldShowWelcomeScreen = true;
this.url = this.defaultPodUrl;
isMaximized = false;