From 98795a0753fc43e4c58b8c3af7aaec1c239c5a10 Mon Sep 17 00:00:00 2001
From: Kanishk Kakar <kanishk.kakar@gmail.com>
Date: Fri, 28 Jun 2019 00:53:06 +0530
Subject: [PATCH 1/3] deps: Upgrade Electron version to 5.0.6.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 812880814..f6c27da7e 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "assert": "1.4.1",
     "cp-file": "5.0.0",
     "devtron": "1.4.0",
-    "electron": "3.1.10",
+    "electron": "5.0.6",
     "electron-builder": "20.40.2",
     "electron-connect": "0.6.2",
     "electron-debug": "1.4.0",

From 24861fd194c9a542a7f3bf44b06540d51465ba6c Mon Sep 17 00:00:00 2001
From: Kanishk Kakar <kanishk.kakar@gmail.com>
Date: Fri, 28 Jun 2019 01:28:53 +0530
Subject: [PATCH 2/3] webview: Enable webviewTag in webPreferences.

* Addresses breaking change where webviewTag must be set to true when
setting webPreferences for a BrowserWindow.
---
 app/main/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/main/index.js b/app/main/index.js
index 350b36ec6..4ed20684e 100644
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -77,7 +77,8 @@ function createMainWindow() {
 		webPreferences: {
 			plugins: true,
 			nodeIntegration: true,
-			partition: 'persist:webviewsession'
+			partition: 'persist:webviewsession',
+			webviewTag: true
 		},
 		show: false
 	});

From c741ed4353c52fe50c7f485ba214e7215f968bb3 Mon Sep 17 00:00:00 2001
From: Kanishk Kakar <kanishk.kakar@gmail.com>
Date: Thu, 4 Jul 2019 17:46:48 +0530
Subject: [PATCH 3/3] preload: Update reason for using dom listeners.

Even though Electron v5 supports numpad keys, we can't add another
accelerator to the same menu item.
---
 app/renderer/js/preload.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/renderer/js/preload.js b/app/renderer/js/preload.js
index 381c7ca97..eeecfa70c 100644
--- a/app/renderer/js/preload.js
+++ b/app/renderer/js/preload.js
@@ -88,7 +88,8 @@ window.addEventListener('beforeunload', () => {
 
 // electron's globalShortcut can cause unexpected results
 // so adding the reload shortcut in the old-school way
-// Zoom from numpad keys is not supported by electron, so adding it through listeners.
+// electron does not support adding multiple accelerators for a menu item
+// so adding numpad shortcuts here
 document.addEventListener('keydown', event => {
 	if (event.code === 'F5') {
 		ipcRenderer.send('forward-message', 'hard-reload');