various/Nativefier
1
0
Fork 0
mirror of https://github.com/jiahaog/Nativefier synced 2024-06-27 07:45:03 +02:00
Code Issues Releases Wiki Activity

add mainWindow and options objects to createMenu args and refactor

Browse Source
This commit is contained in:
Gary Moon 2016-02-24 09:45:22 -05:00
parent 546bad7035
commit ce76d0be7f
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/components/mainWindow/mainWindow.js
View File

@ -54,7 +54,7 @@ function createMainWindow(options, onAppQuit, setDockBadge) {
mainWindow.webContents.send('change-zoom', currentZoom); mainWindow.webContents.send('change-zoom', currentZoom);
}; };
createMenu(options.nativefierVersion, onAppQuit, mainWindow.webContents.goBack, mainWindow.webContents.goForward, onZoomIn, onZoomOut, mainWindow.webContents.getURL); createMenu(options.nativefierVersion, onAppQuit, onZoomIn, onZoomOut, mainWindow, options);
initContextMenu(mainWindow); initContextMenu(mainWindow);
if (options.userAgent) { if (options.userAgent) {

26
app/src/components/menu/menu.js
View File

@ -4,13 +4,12 @@ import {Menu, shell, clipboard, dialog} from 'electron';
* *
* @param {string} nativefierVersion * @param {string} nativefierVersion
* @param {function} onQuit should be from app.quit * @param {function} onQuit should be from app.quit
* @param {function} onGoBack
* @param {electron} onGoForward
* @param {function} onZoomIn * @param {function} onZoomIn
* @param {function} onZoomOut * @param {function} onZoomOut
* @param {function} getUrl * @param {{}}} mainWindow
* @param {{}}} options
*/ */
function createMenu(nativefierVersion, onQuit, onGoBack, onGoForward, onZoomIn, onZoomOut, getUrl) { function createMenu(nativefierVersion, onQuit, onZoomIn, onZoomOut, mainWindow, options) {
if (Menu.getApplicationMenu()) { if (Menu.getApplicationMenu()) {
return; return;
} }
@ -46,7 +45,7 @@ function createMenu(nativefierVersion, onQuit, onGoBack, onGoForward, onZoomIn,
label: 'Copy Current URL', label: 'Copy Current URL',
accelerator: 'CmdOrCtrl+C', accelerator: 'CmdOrCtrl+C',
click: () => { click: () => {
const currentURL = getUrl(); const currentURL = mainWindow.webContents.getURL();
clipboard.writeText(currentURL); clipboard.writeText(currentURL);
} }
}, },
@ -69,14 +68,14 @@ function createMenu(nativefierVersion, onQuit, onGoBack, onGoForward, onZoomIn,
label: 'Back', label: 'Back',
accelerator: 'CmdOrCtrl+[', accelerator: 'CmdOrCtrl+[',
click: () => { click: () => {
onGoBack(); mainWindow.webContents.goBack();
} }
}, },
{ {
label: 'Forward', label: 'Forward',
accelerator: 'CmdOrCtrl+]', accelerator: 'CmdOrCtrl+]',
click: () => { click: () => {
onGoForward(); mainWindow.webContents.goForward();
} }
}, },
{ {
@ -131,9 +130,8 @@ function createMenu(nativefierVersion, onQuit, onGoBack, onGoForward, onZoomIn,
}, },
{ {
label: 'Clear App Data', label: 'Clear App Data',
click: (item, focusedWindow) => { click: () => {
if (focusedWindow) { dialog.showMessageBox(mainWindow, {
dialog.showMessageBox(focusedWindow, {
type: 'warning', type: 'warning',
buttons: ['Yes', 'Cancel'], buttons: ['Yes', 'Cancel'],
defaultId: 1, defaultId: 1,
@ -141,13 +139,15 @@ function createMenu(nativefierVersion, onQuit, onGoBack, onGoForward, onZoomIn,
message: 'This will clear all data (cookies, local storage etc) from this app. Are you sure you wish to proceed?' message: 'This will clear all data (cookies, local storage etc) from this app. Are you sure you wish to proceed?'
}, response => { }, response => {
if (response === 0) { if (response === 0) {
focusedWindow.webContents.session.clearStorageData({}, mainWindow.webContents.session.clearStorageData({},
() => { () => {
focusedWindow.webContents.session.clearCache(() => { mainWindow.webContents.session.clearCache(() => {
focusedWindow.reload(); mainWindow.loadURL(options.targetUrl);
}); });
}); });
} }
});
}
}, },
{ {
label: 'Toggle Window Developer Tools', label: 'Toggle Window Developer Tools',