BrowserView: Improve ipc names.

zulip · Jul 26, 2019 · fc0ed26 · fc0ed26
1 parent 530bf20
commit fc0ed26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/main/viewmanager.ts b/app/main/viewmanager.ts
@@ -16,23 +16,23 @@ class ViewManager {
 	}
 
 	registerIpcs(): void {
-		ipcMain.on('view-create', (e: Event, props: ViewProps) => {
+		ipcMain.on('create-view', (e: Event, props: ViewProps) => {
 			this.create(props);
 		});
 
-		ipcMain.on('view-select', (e: Event, index: number) => {
+		ipcMain.on('select-view', (e: Event, index: number) => {
 			this.select(index);
 		});
 
-		ipcMain.on('view-destroy', (e: Event, index: number) => {
+		ipcMain.on('destroy-view', (e: Event, index: number) => {
 			this.destroy(index);
 		});
 
-		ipcMain.on('view-destroy-all', () => {
+		ipcMain.on('destroy-all-views', () => {
 			this.destroyAll();
 		});
 
-		ipcMain.on('forward-message-view', (e: Event, name: string, ...params: any[]) => {
+		ipcMain.on('forward-view-message', (e: Event, name: string, ...params: any[]) => {
 			this.views[this.selectedIndex].webContents.send(name, ...params);
 		});
 
@@ -75,6 +75,7 @@ class ViewManager {
 	}
 
 	fixBounds(): void {
+		// Any updates to the sidebar width should reflect both here and in css
 		const SIDEBAR_WIDTH = 54;
 		const view = this.views[this.selectedIndex];
 		const showSidebar = ConfigUtil.getConfigItem('showSidebar', true);

diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts
@@ -224,7 +224,7 @@ class ServerManagerView {
 			// Open last active tab
 			this.activateTab(lastActiveTab);
 			// Open last active view
-			ipcRenderer.send('view-select', ConfigUtil.getConfigItem('lastActiveTab'));
+			ipcRenderer.send('select-view', ConfigUtil.getConfigItem('lastActiveTab'));
 			// Remove focus from the settings icon at sidebar bottom
 			this.$settingsButton.classList.remove('active');
 		} else {
@@ -252,7 +252,7 @@ class ServerManagerView {
 			nodeIntegration: false,
 			preload: true
 		};
-		ipcRenderer.send('view-create', props);
+		ipcRenderer.send('create-view', props);
 		this.loading[server.url] = true;
 	}
 
@@ -366,7 +366,7 @@ class ServerManagerView {
 			nodeIntegration: true,
 			preload: false
 		};
-		ipcRenderer.send('view-create', props);
+		ipcRenderer.send('create-view', props);
 		// To show loading indicator the first time a functional tab is opened, indicator is
 		// closed when the functional tab DOM is ready, handled in webview.js
 		this.$webviewsContainer.classList.remove('loaded');
@@ -381,7 +381,7 @@ class ServerManagerView {
 			url: `file://${rendererDirectory}/preference.html#${nav}`
 		});
 		this.$settingsButton.classList.add('active');
-		ipcRenderer.send('forward-message-view', 'switch-settings-nav', nav);
+		ipcRenderer.send('forward-view-message', 'switch-settings-nav', nav);
 	}
 
 	openAbout(): void {
@@ -441,7 +441,7 @@ class ServerManagerView {
 
 		this.activeTabIndex = index;
 		this.tabs[index].activate();
-		ipcRenderer.send('view-select', index);
+		ipcRenderer.send('select-view', index);
 		this.showLoading(this.loading[this.tabs[this.activeTabIndex].props.url]);
 		ipcRenderer.send('call-view-function', 'canGoBackButton');
 		ipcRenderer.send('update-menu', {
@@ -480,7 +480,7 @@ class ServerManagerView {
 		// Show loading indicator
 		this.$webviewsContainer.classList.remove('loaded');
 
-		ipcRenderer.send('view-destroy-all');
+		ipcRenderer.send('destroy-all-views');
 
 		// Clear global variables
 		this.activeTabIndex = -1;
@@ -522,7 +522,7 @@ class ServerManagerView {
 	}
 
 	updateGeneralSettings(setting: string, value: any): void {
-		ipcRenderer.send('forward-message-view', setting, value);
+		ipcRenderer.send('forward-view-message', setting, value);
 	}
 
 	toggleSidebar(show: boolean): void {
@@ -678,7 +678,7 @@ class ServerManagerView {
 		ipcRenderer.on('toggle-dnd', (event: Event, state: boolean, newSettings: SettingsOptions) => {
 			this.toggleDNDButton(state);
 			ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent);
-			ipcRenderer.send('forward-message-view', 'toggle-dnd', state, newSettings);
+			ipcRenderer.send('forward-view-message', 'toggle-dnd', state, newSettings);
 		});
 
 		ipcRenderer.on('update-realm-name', (event: Event, serverURL: string, realmName: string) => {