Deduplicated code in both handlers

Signed-off-by: tarun8718 <tarunkumar8718@gmail.com>
zulip · Mar 18, 2021 · 468676b · 468676b
1 parent 9ccd1fe
commit 468676b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/app/main/menu.ts b/app/main/menu.ts
@@ -344,21 +344,6 @@ function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			accelerator: 'Cmd+,',
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
-					let numberServers = 0;
-					tabs.forEach(tab => {
-						if (tab.role === 'server') {
-							numberServers++;
-						}
-					});
-					if (numberServers === 1) {
-						const value = ConfigUtil.getConfigItem('showSidebar');
-						if (!value) {
-							const newValue = !value;
-							focusedWindow.webContents.send('toggle-sidebar', newValue);
-							ConfigUtil.setConfigItem('showSidebar', newValue);
-						}
-					}
-
 					sendAction('open-settings');
 				}
 			}
@@ -491,21 +476,6 @@ function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			accelerator: 'Ctrl+,',
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
-					let numberServers = 0;
-					tabs.forEach(tab => {
-						if (tab.role === 'server') {
-							numberServers++;
-						}
-					});
-					if (numberServers === 1) {
-						const value = ConfigUtil.getConfigItem('showSidebar');
-						if (!value) {
-							const newValue = !value;
-							focusedWindow.webContents.send('toggle-sidebar', newValue);
-							ConfigUtil.setConfigItem('showSidebar', newValue);
-						}
-					}
-
 					sendAction('open-settings');
 				}
 			}

diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts
@@ -863,6 +863,23 @@ class ServerManagerView {
 		});
 
 		ipcRenderer.on('open-settings', async (event: Event, settingNav: string) => {
+			let numberServers = 0;
+			for (const tab of this.tabs) {
+				if (tab.props.role === 'server') {
+					numberServers++;
+				}
+			}
+
+			if (numberServers === 1) {
+				const value = ConfigUtil.getConfigItem('showSidebar');
+				if (!value) {
+					const newValue = !value;
+					this.toggleSidebar(newValue);
+					this.updateGeneralSettings('toggle-sidebar-setting', newValue);
+					ConfigUtil.setConfigItem('showSidebar', newValue);
+				}
+			}
+
 			await this.openSettings(settingNav);
 		});