Merge pull request #56 from mountainash/49-context-menu

Added right-click context menu support

browser.css

@@ -1,6 +1,10 @@
 ::selection {
 	background-color: transparent;
 }
+input::selection,
+textarea::selection {
+	background-color: #643e9b57;
+}
 .ad-header-wrapper,
 div[class^="Warnings__Container"],
 div[class^="RebrandHeader__"],

index.js

@@ -13,11 +13,11 @@ const { autoUpdater } = require('electron-updater');
 const path = require('path');
 const menuTemplate = require('./menu.js');
 const menu = Menu.buildFromTemplate(menuTemplate);
+const contextMenu = require('electron-context-menu');
 const fs = require('fs');
 const Config = require('electron-config');
 const config = new Config();
 
-
 const BASE_URL = 'https://www.mixcloud.com/';
 const DEBUG = process.env.ELECTRON_DEBUG || false;
 
@@ -29,7 +29,7 @@ let page;
 let isQuitting = false;
 
 let tray = null;
-let contextMenu = null;
+let trayContextMenu = null;
 var _isPlaying = false;
 
 const isRunning = app.requestSingleInstanceLock();
@@ -56,11 +56,11 @@ const initTray = () => {
 	if (!tray) {
 		tray = new Tray(path.join(__dirname, './static/logoTemplate.png'));
 		tray.on('click', togglePlay);
-		tray.on('right-click', displayContextMenu);
+		tray.on('right-click', displayTrayContextMenu);
 		tray.on('double-click', toggleWindow);
 	}
 
-	contextMenu = Menu.buildFromTemplate([
+	trayContextMenu = Menu.buildFromTemplate([
 		{
 			label: 'Play/Pause',
 			click: () => { togglePlay() }
@@ -72,15 +72,17 @@ const initTray = () => {
 	]);
 };
 
-function displayContextMenu() {
-	tray.popUpContextMenu(contextMenu);
+function displayTrayContextMenu() {
+	tray.popUpContextMenu(trayContextMenu);
 }
 
 app.on('activate', () => { win.show() });
 app.on('before-quit', () => isQuitting = true);
 
 app.on('ready', () => {
 	initTray();
+	contextMenu();
+
 	Menu.setApplicationMenu(menu);
 
 	autoUpdater.checkForUpdatesAndNotify();
@@ -101,7 +103,8 @@ app.on('ready', () => {
 			nodeIntegration: true, //TODO turn this off
 			preload: path.join(__dirname, 'browser.js'),
 			plugins: true,
-			partition: 'persist:mixcloud'
+			partition: 'persist:mixcloud',
+			spellcheck: true
 		}
 	};
 	Object.assign(opts, config.get('winBounds'));

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mixcloud-play",
 	"productName": "Mixcloud Play",
-	"version": "0.12.0",
+	"version": "0.13.0",
 	"description": "The Mixcloud desktop client",
 	"keywords": [
 		"music",
@@ -43,6 +43,7 @@
 	},
 	"dependencies": {
 		"electron-config": "2.0.0",
+		"electron-context-menu": "2.3.0",
 		"electron-updater": "4.3.5",
 		"source-map-support": "0.5.19"
 	},