Closes #134; Reload current server instead of all application

RocketChat · Mar 5, 2016 · 7600f7f · 7600f7f
1 parent b37214c
commit 7600f7f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/app/scripts/menus.js b/app/scripts/menus.js
@@ -3,6 +3,7 @@
 import { remote } from 'electron';
 import { servers } from './servers';
 import { sidebar } from './sidebar';
+import { webview } from './webview';
 import config from './config';
 import '../branding/branding.js';
 
@@ -104,8 +105,18 @@ if (process.platform === 'darwin') {
 			label: 'View',
 			submenu: [
 				{
-					label: 'Reload',
+					label: 'Reload current server',
 					accelerator: 'Command+R',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.reload();
+						}
+					}
+				},
+				{
+					label: 'Reload application',
+					accelerator: 'Command+Shift+R',
 					click: function() {
 						remote.getCurrentWindow().reload();
 					}
@@ -217,8 +228,18 @@ if (process.platform === 'darwin') {
 			label: 'View',
 			submenu: [
 				{
-					label: 'Reload',
+					label: 'Reload current server',
 					accelerator: 'Ctrl+R',
+					click: function() {
+						const activeWebview = webview.getActive();
+						if (activeWebview) {
+							activeWebview.reload();
+						}
+					}
+				},
+				{
+					label: 'Reload application',
+					accelerator: 'Ctrl+Shift+R',
 					click: function() {
 						remote.getCurrentWindow().reload();
 					}

diff --git a/app/scripts/sidebar.js b/app/scripts/sidebar.js
@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
 import { remote } from 'electron';
 import { servers } from './servers';
+import { webview } from './webview';
 import { menuTemplate } from './menus';
 
 var Menu = remote.Menu;
@@ -233,6 +234,12 @@ export var sidebar = new SideBar();
 
 var selectedInstance = null;
 var instanceMenu = remote.Menu.buildFromTemplate([{
+	label: 'Reload server',
+	click: function() {
+		const activeWebview = webview.getByUrl(selectedInstance.dataset.host);
+		activeWebview.reload();
+	}
+}, {
 	label: 'Remove server',
 	click: function() {
 		servers.removeHost(selectedInstance.dataset.host);