From e2254a6e9646acb2096876f55cea89b3b5a123e9 Mon Sep 17 00:00:00 2001 From: Nils Hesse Date: Mon, 5 Sep 2016 20:56:49 +0200 Subject: [PATCH 1/3] Add context menu --- electron/main.js | 6 ++++++ package.json | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/electron/main.js b/electron/main.js index e2a28c2a..3b39e6ea 100644 --- a/electron/main.js +++ b/electron/main.js @@ -13,6 +13,12 @@ var globalSettings = require('./global_settings.js'); const isDev = require('electron-is-dev'); const updater = require('./updater'); +require('electron-context-menu')({ + prepend: params => [{ + label: 'Rambox' + }] +}); + // this should be placed at top of main.js to handle setup events quickly if (handleSquirrelEvent()) { // squirrel event handled and app will exit in 1000ms, so don't do anything else diff --git a/package.json b/package.json index 27084815..e696c56b 100644 --- a/package.json +++ b/package.json @@ -128,6 +128,7 @@ "firebase-token-generator": "^2.0.0", "tmp": "0.0.28", "mime": "^1.3.4", - "electron-is-dev": "^0.1.1" + "electron-is-dev": "^0.1.1", + "electron-context-menu": "^0.5.0" } } From 113ad69d0f2c8d7b78cb0231142ac73718f47ca4 Mon Sep 17 00:00:00 2001 From: Nils Hesse Date: Mon, 5 Sep 2016 20:57:52 +0200 Subject: [PATCH 2/3] Fix whitespace --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e696c56b..4f616822 100644 --- a/package.json +++ b/package.json @@ -129,6 +129,6 @@ "tmp": "0.0.28", "mime": "^1.3.4", "electron-is-dev": "^0.1.1", - "electron-context-menu": "^0.5.0" + "electron-context-menu": "^0.5.0" } } From c89143cde2ae3532f9822426460c7e93b09889b7 Mon Sep 17 00:00:00 2001 From: Nils Hesse Date: Mon, 5 Sep 2016 20:58:28 +0200 Subject: [PATCH 3/3] Fix whitespace #2 --- electron/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electron/main.js b/electron/main.js index 3b39e6ea..d5ea58e3 100644 --- a/electron/main.js +++ b/electron/main.js @@ -14,9 +14,9 @@ const isDev = require('electron-is-dev'); const updater = require('./updater'); require('electron-context-menu')({ - prepend: params => [{ - label: 'Rambox' - }] + prepend: params => [{ + label: 'Rambox' + }] }); // this should be placed at top of main.js to handle setup events quickly