xo: Fix unicorn/prefer-ternary, I guess.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-10-24 14:53:42 -07:00
parent 13ee1d0990
commit 31d5e5a092
4 changed files with 12 additions and 29 deletions

View File

@@ -19,11 +19,7 @@ export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> =>
name: 'Zulip',
isHidden: false
});
if (autoLaunchOption) {
await ZulipAutoLauncher.enable();
} else {
await ZulipAutoLauncher.disable();
}
await (autoLaunchOption ? ZulipAutoLauncher.enable() : ZulipAutoLauncher.disable());
} else {
app.setLoginItemSettings({
openAtLogin: autoLaunchOption,

View File

@@ -54,11 +54,7 @@ export default class ServerTab extends Tab {
let shortcutText = '';
if (SystemUtil.getOS() === 'Mac') {
shortcutText = `${shownIndex}`;
} else {
shortcutText = `Ctrl+${shownIndex}`;
}
shortcutText = SystemUtil.getOS() === 'Mac' ? `${shownIndex}` : `Ctrl+${shownIndex}`;
// Array index == Shown index - 1
ipcRenderer.send('switch-server-tab', shownIndex - 1);

View File

@@ -161,19 +161,15 @@ class ServerManagerView {
}
const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');
if (proxyEnabled) {
await session.fromPartition('persist:webviewsession').setProxy({
pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
});
} else {
await session.fromPartition('persist:webviewsession').setProxy({
pacScript: '',
proxyRules: '',
proxyBypassRules: ''
});
}
await session.fromPartition('persist:webviewsession').setProxy(proxyEnabled ? {
pacScript: ConfigUtil.getConfigItem('proxyPAC', ''),
proxyRules: ConfigUtil.getConfigItem('proxyRules', ''),
proxyBypassRules: ConfigUtil.getConfigItem('proxyBypass', '')
} : {
pacScript: '',
proxyRules: '',
proxyBypassRules: ''
});
}
// Settings are initialized only when user clicks on General/Server/Network section settings

View File

@@ -1,13 +1,8 @@
import electron from 'electron';
import fs from 'fs';
let app: Electron.App = null;
const app = process.type === 'renderer' ? electron.remote.app : electron.app;
let setupCompleted = false;
if (process.type === 'renderer') {
app = electron.remote.app;
} else {
app = electron.app;
}
const zulipDir = app.getPath('userData');
const logDir = `${zulipDir}/Logs/`;