From af15a0082826c0b1268588f27449fe516c0c5b97 Mon Sep 17 00:00:00 2001
From: Tor Hveem <tor@hveem.no>
Date: Wed, 11 May 2016 11:38:07 +0200
Subject: [PATCH] Bump to electron 1.0

---
 electron-main.js    | 4 ++--
 electron-start.html | 3 ++-
 electron.makefile   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/electron-main.js b/electron-main.js
index 8030b31..729323e 100644
--- a/electron-main.js
+++ b/electron-main.js
@@ -6,7 +6,7 @@
 
     const ipcMain = require('electron').ipcMain;
     const nativeImage = require('electron').nativeImage;
-    const Menu = require('menu');
+    const Menu = require('electron').Menu;
 
     var template;
 
@@ -186,7 +186,7 @@
         Menu.setApplicationMenu(menu);
 
         mainWindow = new BrowserWindow({width: 1280, height: 800, 'min-width': 1024, 'min-height': 600, 'autoHideMenuBar': true, 'web-security': true, 'java': false, 'accept-first-mouse': true, defaultEncoding: 'UTF-8', 'icon':'file://'+__dirname + '/assets/img/favicon.png'});
-        mainWindow.loadUrl('file://' + __dirname + '/electron-start.html');
+        mainWindow.loadURL('file://' + __dirname + '/electron-start.html');
         mainWindow.focus();
 
         // Listen for badge changes
diff --git a/electron-start.html b/electron-start.html
index a9f5623..028a7a9 100644
--- a/electron-start.html
+++ b/electron-start.html
@@ -7,6 +7,7 @@ onload = function() {
     const ipc= require('electron').ipcRenderer;
     const remote = require('electron').remote;
     const nativeImage = require('electron').nativeImage;
+    const shell = require('electron').shell;
 
     var webview = document.getElementById("glowingbear");
 
@@ -14,7 +15,7 @@ onload = function() {
         console.log("webview: " + e.message);
     }
     var handlenewwindow = function(e) {
-        require('shell').openExternal(e.url);
+        shell.openExternal(e.url);
     }
     var handletitleset = function(e) {
         document.title = e.title;
diff --git a/electron.makefile b/electron.makefile
index 179b393..c1ff424 100644
--- a/electron.makefile
+++ b/electron.makefile
@@ -18,10 +18,10 @@ uselocal: copylocal
 
 # build the electron app for various platforms
 build-electron-windows: uselocal
-	electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=0.37.6 --icon=assets/img/favicon.ico --asar=true
+	electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=1.0.0 --icon=assets/img/favicon.ico --asar=true
 
 build-electron-darwin: uselocal
-	electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=0.37.6 --icon=assets/img/glowing-bear.icns
+	electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=1.0.0 --icon=assets/img/glowing-bear.icns
 
 build-electron-linux: uselocal
-	electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=0.37.6 --icon=assets/img/favicon.ico
+	electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=1.0.0 --icon=assets/img/favicon.ico