diff --git a/app-menu.js b/app-menu.js index 258e5ff8..f26ba22f 100644 --- a/app-menu.js +++ b/app-menu.js @@ -2,113 +2,102 @@ var Menu = require('menu'); -var createTemplate = function(mainWindow){ +var createTemplate = function(mainWindow) { var first_menu_name = (process.platform === 'darwin') ? require('app').getName() : 'File'; var template = []; template.push({ label: first_menu_name, - submenu: [ - { - label: 'Settings', - click: function(item, focusedWindow){ - mainWindow.loadUrl('file://' + __dirname + '/settings.html'); - } - }, - { - label: 'Quit', - accelerator: 'CmdOrCtrl+Q', - click: function(item, focusedWindow){ - require('app').quit(); - } + submenu: [{ + label: 'Settings', + click: function(item, focusedWindow) { + mainWindow.loadUrl('file://' + __dirname + '/settings.html'); } - ] + }, { + label: 'Quit', + accelerator: 'CmdOrCtrl+Q', + click: function(item, focusedWindow) { + require('app').quit(); + } + }] }); template.push({ label: 'Edit', - submenu: [ - { - label: 'Undo', - accelerator: 'CmdOrCtrl+Z', - role: 'undo' - }, - { - label: 'Redo', - accelerator: 'Shift+CmdOrCtrl+Z', - role: 'redo' - }, - { - type: 'separator' - }, - { - label: 'Cut', - accelerator: 'CmdOrCtrl+X', - role: 'cut' - }, - { - label: 'Copy', - accelerator: 'CmdOrCtrl+C', - role: 'copy' - }, - { - label: 'Paste', - accelerator: 'CmdOrCtrl+V', - role: 'paste' - }, - { - label: 'Select All', - accelerator: 'CmdOrCtrl+A', - role: 'selectall' - }, - ] + submenu: [{ + label: 'Undo', + accelerator: 'CmdOrCtrl+Z', + role: 'undo' + }, { + label: 'Redo', + accelerator: 'Shift+CmdOrCtrl+Z', + role: 'redo' + }, { + type: 'separator' + }, { + label: 'Cut', + accelerator: 'CmdOrCtrl+X', + role: 'cut' + }, { + label: 'Copy', + accelerator: 'CmdOrCtrl+C', + role: 'copy' + }, { + label: 'Paste', + accelerator: 'CmdOrCtrl+V', + role: 'paste' + }, { + label: 'Select All', + accelerator: 'CmdOrCtrl+A', + role: 'selectall' + }, ] }); template.push({ label: 'View', - submenu: [ - { - label: 'Reload', - accelerator: 'CmdOrCtrl+R', - click: function(item, focusedWindow) { - if (focusedWindow) - focusedWindow.reload(); + submenu: [{ + label: 'Reload', + accelerator: 'CmdOrCtrl+R', + click: function(item, focusedWindow) { + if (focusedWindow) + focusedWindow.reload(); + } + }, { + label: 'Toggle Full Screen', + accelerator: (function() { + if (process.platform === 'darwin') { + return 'Ctrl+Command+F'; } - }, - { - label: 'Toggle Full Screen', - accelerator: (function() { - if (process.platform === 'darwin'){ - return 'Ctrl+Command+F'; - } else { - return 'F11'; - } - })(), - click: function(item, focusedWindow) { - if (focusedWindow) { - focusedWindow.setFullScreen(!focusedWindow.isFullScreen()); - } + else { + return 'F11'; } - }, - { - label: 'Toggle Developer Tools', - accelerator: (function() { - if (process.platform === 'darwin') { - return 'Alt+Command+I'; - } else { - return 'Ctrl+Shift+I'; - } - })(), - click: function(item, focusedWindow) { - if (focusedWindow) { - focusedWindow.toggleDevTools(); - } + })(), + click: function(item, focusedWindow) { + if (focusedWindow) { + focusedWindow.setFullScreen(!focusedWindow.isFullScreen()); } - }, - ] + } + }, { + label: 'Toggle Developer Tools', + accelerator: (function() { + if (process.platform === 'darwin') { + return 'Alt+Command+I'; + } + else { + return 'Ctrl+Shift+I'; + } + })(), + click: function(item, focusedWindow) { + if (focusedWindow) { + focusedWindow.toggleDevTools(); + } + } + }, ] }); return template; }; -var createMenu = function(mainWindow){ +var createMenu = function(mainWindow) { return Menu.buildFromTemplate(createTemplate(mainWindow)); }; -module.exports = { createMenu: createMenu }; +module.exports = { + createMenu: createMenu +}; diff --git a/index.html b/index.html index 4f0d9a3c..6f3db41a 100644 --- a/index.html +++ b/index.html @@ -1,21 +1,24 @@ +