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

sda-1717 made screenShareIndicatorFrameUtil and execCmd public

Browse Source
This commit is contained in:
Johan Kwarnmark 2020-03-02 14:36:53 +01:00
parent 2495e591de
commit 8b251a3cca
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ export class WindowHandler {
public spellchecker: SpellChecker | undefined; public spellchecker: SpellChecker | undefined;
public isCustomTitleBar: boolean; public isCustomTitleBar: boolean;
public isWebPageLoading: boolean = true; public isWebPageLoading: boolean = true;
public screenShareIndicatorFrameUtil: string;
private readonly contextIsolation: boolean; private readonly contextIsolation: boolean;
private readonly backgroundThrottling: boolean; private readonly backgroundThrottling: boolean;
@ -92,7 +93,6 @@ export class WindowHandler {
private screenSharingFrameWindow: Electron.BrowserWindow | null = null; private screenSharingFrameWindow: Electron.BrowserWindow | null = null;
private basicAuthWindow: Electron.BrowserWindow | null = null; private basicAuthWindow: Electron.BrowserWindow | null = null;
private notificationSettingsWindow: Electron.BrowserWindow | null = null; private notificationSettingsWindow: Electron.BrowserWindow | null = null;
private screenShareIndicatorFrameUtil: string;
constructor(opts?: Electron.BrowserViewConstructorOptions) { constructor(opts?: Electron.BrowserViewConstructorOptions) {
// Use these variables only on initial setup // Use these variables only on initial setup
@ -918,6 +918,26 @@ export class WindowHandler {
delete this.windows[key]; delete this.windows[key];
} }
/**
* Executes the given command via a child process
*
* @param util {string}
* @param utilArgs {ReadonlyArray<string>}
*/
public execCmd(util: string, utilArgs: ReadonlyArray<string>): Promise<ChildProcess> {
logger.info(`window handler: execCmd: util: ${util} utilArgs: ${utilArgs}`);
return new Promise<ChildProcess>((resolve, reject) => {
return execFile(util, utilArgs, (error: ExecException | null) => {
logger.info(`window handler: execCmd: error: ${error}`);
if (error && error.killed) {
// processs was killed, just resolve with no data.
return reject(error);
}
resolve();
});
});
}
/** /**
* Sets the about panel details for macOS * Sets the about panel details for macOS
*/ */
@ -1046,27 +1066,6 @@ export class WindowHandler {
return {...defaultWindowOpts, ...windowOpts}; return {...defaultWindowOpts, ...windowOpts};
} }
/**
* Executes the given command via a child process
*
* @param util {string}
* @param utilArgs {ReadonlyArray<string>}
*/
private execCmd(util: string, utilArgs: ReadonlyArray<string>): Promise<ChildProcess> {
logger.info(`window handler: execCmd: util: ${util} utilArgs: ${utilArgs}`);
return new Promise<ChildProcess>((resolve, reject) => {
return execFile(util, utilArgs, (error: ExecException | null) => {
logger.info(`window handler: execCmd: error: ${error}`);
if (error && error.killed) {
// processs was killed, just resolve with no data.
return reject(error);
}
resolve();
});
});
}
} }
const windowHandler = new WindowHandler(); const windowHandler = new WindowHandler();