Fix menus again

main.js

@@ -148,86 +148,67 @@ if (settings.httpAdminRoot !== false) {
 red_app.use(settings.httpNodeRoot,RED.httpNode);
 
 // Create the Application's main menu
-var template = [];
+var template = [{
-if (process.platform === 'darwin') { // Mac has it's own first menu
+    label: 'Node-RED',
-    template.push( {
+    submenu: [
-        label: app.getName(),
+        {   label: 'Import Flow',
-        submenu: [
+            accelerator: "Shift+CmdOrCtrl+O",
-            { type: 'separator' },
+            click() { openFlow(); }
-            { type: 'separator' },
+        },
-            { role: 'about' },
+        {   label: 'Save Flow As',
-            { type: 'separator' },
+            accelerator: "Shift+CmdOrCtrl+S",
-            { role: 'hide' },
+            click() { saveFlow(); }
-            { role: 'hideothers' },
+        },
-            { role: 'unhide' },
+        {   type: 'separator' },
-            { type: 'separator' },
+        {   label: 'Console',
-            { role: 'togglefullscreen' },
+            accelerator: "Shift+CmdOrCtrl+C",
-            { role: 'quit' }        
+            click() { createConsole(); }
-        ]
+        },
-    } )
+        {   label: 'Dashboard',
-}
+            accelerator: "Shift+CmdOrCtrl+D",
-// Now add the main Node-RED menu
+            click() { mainWindow.loadURL("http://localhost:"+listenPort+urldash); }
-template.push(
+        },
-    { label: 'Node-RED',
+        {   label: 'Editor',
-        submenu: [
+            accelerator: "Shift+CmdOrCtrl+E",
-            {   label: 'Import Flow',
+            click() { mainWindow.loadURL("http://localhost:"+listenPort+urledit); }
-                accelerator: "Shift+CmdOrCtrl+O",
+        },
-                click() { openFlow(); }
+        {   label: 'Worldmap',
-            },
+            accelerator: "Shift+CmdOrCtrl+M",
-            {   label: 'Save Flow As',
+            click() { mainWindow.loadURL("http://localhost:"+listenPort+urlmap); }
-                accelerator: "Shift+CmdOrCtrl+S",
+        },
-                click() { saveFlow(); }
+        {   type: 'separator' },
-            },
+        {   type: 'separator' },
-            {   type: 'separator' },
+        {   label: 'Documentation',
-            {   label: 'Console',
+            click() { electron.shell.openExternal('https://nodered.org/docs') }
-                accelerator: "Shift+CmdOrCtrl+C",
+        },
-                click() { createConsole(); }
+        {   label: 'Flows and Nodes',
-            },
+            click() { electron.shell.openExternal('https://flows.nodered.org') }
-            {   label: 'Dashboard',
+        },
-                accelerator: "Shift+CmdOrCtrl+D",
+        {   label: 'Discourse Forum',
-                click() { mainWindow.loadURL("http://localhost:"+listenPort+urldash); }
+            click() { electron.shell.openExternal('https://discourse.nodered.org/') }
-            },
+        },
-            {   label: 'Editor',
+        { type: 'separator' },
-                accelerator: "Shift+CmdOrCtrl+E",
+        { role: 'togglefullscreen' },
-                click() { mainWindow.loadURL("http://localhost:"+listenPort+urledit); }
+        { role: 'quit' }
-            },
+    ]
-            {   label: 'Worldmap',
+}];
-                accelerator: "Shift+CmdOrCtrl+M",
-                click() { mainWindow.loadURL("http://localhost:"+listenPort+urlmap); }
-            },
-            {   type: 'separator' },
-            {   type: 'separator' },
-            {   label: 'Documentation',
-                click() { electron.shell.openExternal('https://nodered.org/docs') }
-            },
-            {   label: 'Flows and Nodes',
-                click() { electron.shell.openExternal('https://flows.nodered.org') }
-            },
-            {   label: 'Discourse Forum',
-                click() { electron.shell.openExternal('https://discourse.nodered.org/') }
-            }
-        ]
-    }
-);
 
-var tempNum = template.length - 1;
+if (!showMap) { template[0].submenu.splice(6,1); }
-// Add quit and toggle full screen to this menu if not on Mac
-if (process.platform !== 'darwin') {
-    template[tempNum].submenu.push({ type: "separator" });
-    template[tempNum].submenu.push({ role: 'togglefullscreen' });
-    template[tempNum].submenu.push({ role: 'quit' });
-    if (!showMap) { template[tempNum].submenu.splice(8,1); }
-}
-else {
-    if (!showMap) { template[tempNum].submenu.splice(6,1); }
-}
 
 if (!editable) {
-    template[tempNum].submenu.splice(3,1);
+    template[0].submenu.splice(3,1);
-    template[tempNum].submenu.splice(4,1);
+    template[0].submenu.splice(4,1);
 }
 
-if (!allowLoadSave) { template[tempNum].submenu.splice(0,2); }
+if (!allowLoadSave) { template[0].submenu.splice(0,2); }
+
+// Top and tail menu on Mac
+if (process.platform === 'darwin') { 
+    template[0].submenu.unshift({ type: 'separator' });
+    template[0].submenu.unshift({ role: 'about' });
+    template[0].submenu.unshift({ type: 'separator' });
+    template[0].submenu.unshift({ type: 'separator' });
+}
 
 let fileName = "";
 function saveFlow() {

package.json

@@ -15,11 +15,11 @@
         "url": "git+https://github.com/dceejay/electron-node-red.git"
     },
     "dependencies": {
-        "express": "~4.17.1",
+        "express": "^4.17.1",
         "node-red": "1.0.2",
         "node-red-contrib-play-audio": "*",
-        "node-red-contrib-web-worldmap": "~2.1.4",
+        "node-red-contrib-web-worldmap": "*",
-        "node-red-dashboard": "~2.17.1",
+        "node-red-dashboard": "^2.17.1",
         "node-red-node-base64": "*",
         "node-red-node-geofence": "*",
         "node-red-node-random": "*",
@@ -40,9 +40,8 @@
     },
     "homepage": "https://github.com/dceejay/electron-node-red#readme",
     "devDependencies": {
-        "electron": "~6.0.12",
+        "electron": "^7.0.0",
-        "electron-builder": "^21.2.0",
+        "electron-builder": "^21.2.0"
-        "electron-create-menu": "^3.0.0"
     },
     "build": {
         "npmRebuild": false,