Reload current view properly [WIP]

zulip · Oct 10, 2017 · 40e3ed0 · 40e3ed0
1 parent 5d98885
commit 40e3ed0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/main/index.js b/app/main/index.js
@@ -127,7 +127,7 @@ function createMainWindow() {
 function registerLocalShortcuts(page) {
 	// Somehow, reload action cannot be overwritten by the menu item
 	electronLocalshortcut.register(mainWindow, 'CommandOrControl+R', () => {
-		page.send('reload-viewer');
+		page.send('reload-current-viewer');
 	});
 
 	// Also adding these shortcuts because some users might want to use it instead of CMD/Left-Right

diff --git a/app/main/menu.js b/app/main/menu.js
@@ -37,7 +37,7 @@ class AppMenu {
 			accelerator: 'CommandOrControl+R',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
-					AppMenu.sendAction('reload-viewer');
+					AppMenu.sendAction('reload-current-viewer');
 				}
 			}
 		}, {

diff --git a/app/renderer/js/main.js b/app/renderer/js/main.js
@@ -272,6 +272,12 @@ class ServerManagerView {
 		this.initTabs();
 	}
 
+	// This will trigger when pressed CTRL/CMD + R [WIP]
+	// It won't reload the current view properly when you add/delete a server.
+	reloadCurrentView() {
+		this.$reloadButton.click();
+	}
+
 	updateBadge() {
 		let messageCountAll = 0;
 		for (let i = 0; i < this.tabs.length; i++) {
@@ -324,6 +330,8 @@ class ServerManagerView {
 
 		ipcRenderer.on('reload-viewer', this.reloadView.bind(this, this.tabs[this.activeTabIndex].props.index));
 
+		ipcRenderer.on('reload-current-viewer', this.reloadCurrentView.bind(this));
+
 		ipcRenderer.on('hard-reload', () => {
 			ipcRenderer.send('reload-full-app');
 		});