mirror of
https://github.com/finos/SymphonyElectron.git
synced 2024-11-21 16:38:41 -06:00
SDA-3646 Bugfix - Shared app remains in background
This commit is contained in:
sbenmoussati
Salah Benmoussati
parent
882da2a42f
commit
7945630951
42
package-lock.json
generated
42
package-lock.json
generated
@ -4426,7 +4426,7 @@
|
||||
"dependencies": {
|
||||
"escape-string-regexp": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
|
||||
"dev": true
|
||||
}
|
||||
@ -5226,7 +5226,7 @@
|
||||
},
|
||||
"css-value": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/css-value/-/css-value-0.0.1.tgz",
|
||||
"integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
|
||||
"dev": true
|
||||
},
|
||||
@ -5649,7 +5649,7 @@
|
||||
},
|
||||
"depd": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/depd/-/depd-1.1.2.tgz",
|
||||
"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
|
||||
"dev": true
|
||||
},
|
||||
@ -5713,7 +5713,7 @@
|
||||
},
|
||||
"dev-null": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/dev-null/-/dev-null-0.1.1.tgz",
|
||||
"integrity": "sha1-WiBc48Ky73e2I41roXnrdMag6Bg=",
|
||||
"dev": true
|
||||
},
|
||||
@ -6059,9 +6059,9 @@
|
||||
}
|
||||
},
|
||||
"electron": {
|
||||
"version": "17.3.0",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-17.3.0.tgz",
|
||||
"integrity": "sha512-KuYHCOw1a+CE9thZlWRqTScf6M81KLd6n5qpdBGb0rl62+50RUuau9CnYpBb3EJxrjsXLaiQCBBSdPsozf/XUg==",
|
||||
"version": "17.4.0",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-17.4.0.tgz",
|
||||
"integrity": "sha1-mte2uskiQdrV6Ks+n2UvDtMRSFk=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@electron/get": "^1.13.0",
|
||||
@ -6071,8 +6071,8 @@
|
||||
"dependencies": {
|
||||
"@types/node": {
|
||||
"version": "14.18.12",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
|
||||
"integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/@types/node/-/node-14.18.12.tgz",
|
||||
"integrity": "sha1-DUVX/TuUSX15Pv1OfZLfL4O07yQ=",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
@ -9612,7 +9612,7 @@
|
||||
},
|
||||
"humanize-ms": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/humanize-ms/-/humanize-ms-1.2.1.tgz",
|
||||
"integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
@ -9950,7 +9950,7 @@
|
||||
},
|
||||
"ip": {
|
||||
"version": "1.1.5",
|
||||
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/ip/-/ip-1.1.5.tgz",
|
||||
"integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
|
||||
"dev": true
|
||||
},
|
||||
@ -10196,7 +10196,7 @@
|
||||
},
|
||||
"is-lambda": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/is-lambda/-/is-lambda-1.0.1.tgz",
|
||||
"integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=",
|
||||
"dev": true
|
||||
},
|
||||
@ -11937,7 +11937,7 @@
|
||||
},
|
||||
"lodash.isobject": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
|
||||
"integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
|
||||
"dev": true
|
||||
},
|
||||
@ -11989,7 +11989,7 @@
|
||||
},
|
||||
"lodash.zip": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/lodash.zip/-/lodash.zip-4.2.0.tgz",
|
||||
"integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
|
||||
"dev": true
|
||||
},
|
||||
@ -12943,19 +12943,19 @@
|
||||
"dependencies": {
|
||||
"tr46": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/tr46/-/tr46-0.0.3.tgz",
|
||||
"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
|
||||
"dev": true
|
||||
},
|
||||
"webidl-conversions": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||
"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
|
||||
"dev": true
|
||||
},
|
||||
"whatwg-url": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||
"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
@ -14471,7 +14471,7 @@
|
||||
},
|
||||
"promise-inflight": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/promise-inflight/-/promise-inflight-1.0.1.tgz",
|
||||
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
|
||||
"dev": true
|
||||
},
|
||||
@ -15367,7 +15367,7 @@
|
||||
"dependencies": {
|
||||
"fast-deep-equal": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
|
||||
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
|
||||
"dev": true
|
||||
}
|
||||
@ -15391,7 +15391,7 @@
|
||||
},
|
||||
"retry": {
|
||||
"version": "0.12.0",
|
||||
"resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
|
||||
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/retry/-/retry-0.12.0.tgz",
|
||||
"integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
|
||||
"dev": true
|
||||
},
|
||||
@ -18997,4 +18997,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -125,7 +125,7 @@
|
||||
"browserify": "16.5.1",
|
||||
"cross-env": "5.2.0",
|
||||
"del": "3.0.0",
|
||||
"electron": "17.3.0",
|
||||
"electron": "^17.4.0",
|
||||
"electron-builder": "22.7.0",
|
||||
"electron-builder-squirrel-windows": "20.38.3",
|
||||
"electron-icon-maker": "0.0.4",
|
||||
|
||||
@ -1407,7 +1407,7 @@ export class WindowHandler {
|
||||
alwaysOnTop: true,
|
||||
autoHideMenuBar: true,
|
||||
frame: false,
|
||||
modal: true,
|
||||
modal: false,
|
||||
height: isMac ? 519 : 523,
|
||||
width: 580,
|
||||
show: false,
|
||||
@ -1417,10 +1417,6 @@ export class WindowHandler {
|
||||
devTools: isDevEnv,
|
||||
},
|
||||
);
|
||||
const focusedWindow = BrowserWindow.getFocusedWindow();
|
||||
if (focusedWindow && windowExists(focusedWindow) && isWindowsOS) {
|
||||
opts.parent = focusedWindow;
|
||||
}
|
||||
|
||||
this.screenPickerWindow = createComponentWindow('screen-picker', opts);
|
||||
this.moveWindow(this.screenPickerWindow);
|
||||
@ -1462,7 +1458,8 @@ export class WindowHandler {
|
||||
|
||||
window.send('start-share' + id, source);
|
||||
if (this.screenPickerWindow && windowExists(this.screenPickerWindow)) {
|
||||
this.screenPickerWindow.close();
|
||||
// SDA-3635 hack
|
||||
setTimeout(() => this.screenPickerWindow?.close(), 500);
|
||||
}
|
||||
});
|
||||
this.screenPickerWindow.once('closed', () => {
|
||||
@ -1671,7 +1668,7 @@ export class WindowHandler {
|
||||
width: 592,
|
||||
height: 48,
|
||||
show: false,
|
||||
modal: true,
|
||||
modal: false,
|
||||
frame: false,
|
||||
focusable: true,
|
||||
transparent: true,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user