Merge branch 'master' of github.com:shama/letswritecode

shama · shama · commit 85da2b05e608 · 2018-03-21T08:25:40.000-07:00
* 'master' of github.com:shama/letswritecode:
  Updated multiple-window-electron-desktop-app to work with electron v1.6.2
diff --git a/multi-window-electron-desktop-app/app.js b/multi-window-electron-desktop-app/app.js
@@ -1,26 +1,25 @@
-var app = require('app')
-var BrowserWindow = require('browser-window')
-var ipc = require('ipc')
-
-app.on('ready', function () {
-  var mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600
-  })
-  mainWindow.loadUrl('file://' + __dirname + '/main.html')
-  mainWindow.openDevTools()
-
-  var prefsWindow = new BrowserWindow({
-    width: 400,
-    height: 400,
-    show: false
-  })
-  prefsWindow.loadUrl('file://' + __dirname + '/prefs.html')
-
-  ipc.on('toggle-prefs', function () {
-    if (prefsWindow.isVisible())
-      prefsWindow.hide()
-    else
-      prefsWindow.show()
-  })
-})
+const {app, BrowserWindow, ipcMain} = require('electron')
+
+app.on('ready', function () {
+  var mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600
+  })
+  mainWindow.loadURL('file://' + __dirname + '/main.html')
+  mainWindow.openDevTools()
+
+  var prefsWindow = new BrowserWindow({
+    width: 400,
+    height: 400,
+    show: false
+  })
+  prefsWindow.loadURL('file://' + __dirname + '/prefs.html')
+
+  ipcMain.on('toggle-prefs', function () {
+    if (prefsWindow.isVisible())
+      prefsWindow.hide()
+    else
+      prefsWindow.show()
+  })
+
+})
diff --git a/multi-window-electron-desktop-app/main.js b/multi-window-electron-desktop-app/main.js
@@ -1,18 +1,20 @@
-var remote = require('remote')
-var ipc = require('ipc')
-var Menu = remote.require('menu')
-
-var menu = Menu.buildFromTemplate([
-  {
-    label: 'Electron',
-    submenu: [
-      {
-        label: 'Prefs',
-        click: function () {
-          ipc.send('toggle-prefs')
-        }
-      }
-    ]
-  }
-])
-Menu.setApplicationMenu(menu)
+const {remote, ipcRenderer} = require('electron')
+const {Menu, MenuItem} = remote
+
+const menu = new Menu()
+
+menu.append(new MenuItem(
+  {
+    label: 'Electron',
+    submenu: [
+      {
+        label: 'Prefs',
+        click: function () {
+            ipcRenderer.send('toggle-prefs')
+        }
+      }
+    ]
+  })
+)
+
+Menu.setApplicationMenu(menu)
diff --git a/multi-window-electron-desktop-app/prefs.html b/multi-window-electron-desktop-app/prefs.html
@@ -1,18 +1,18 @@
-<html>
-  <head>
-    <title></title>
-  </head>
-  <body>
-    Prefs
-    <script>
-    var ipc = require('ipc')
-
-    var button = document.createElement('button')
-    button.textContent = 'Hide'
-    button.addEventListener('click', function () {
-      ipc.send('toggle-prefs')
-    })
-    document.body.appendChild(button)
-    </script>
-  </body>
-</html>
+<html>
+  <head>
+    <title></title>
+  </head>
+  <body>
+    Prefs
+    <script>
+    const {ipcRenderer} = require('electron')
+    
+    var button = document.createElement('button')
+    button.textContent = 'Hide'
+    button.addEventListener('click', function () {
+      ipcRenderer.send('toggle-prefs')
+    });
+    document.body.appendChild(button)
+    </script>
+  </body>
+</html>
