self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Desktop: fix Resources menu item on macOS (#2530)

Browse Source 
* fix Resources menu item

On macOS the menu item `Resources` never showed up under `Tools`.

* var -> let
This commit is contained in:
Helmut K. C. Tessarek 2020-02-21 00:33:48 -05:00 committed by GitHub
parent ea1db84fcc
commit ce40813bcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ElectronClient/app.js
View File

@ -381,6 +381,7 @@ class Application extends BaseApplication {
accelerator: 'CommandOrControl+Shift+B',
});
let toolsItems = [];
const importItems = [];
const exportItems = [];
const toolsItemsFirst = [];
@ -489,16 +490,6 @@ class Application extends BaseApplication {
},
};
const resourceViewItem = {
label: _('Resources'),
click: () => {
this.dispatch({
type: 'NAV_GO',
routeName: 'Resources',
});
},
};
const newNoteItem = {
label: _('New note'),
accelerator: 'CommandOrControl+N',
@ -614,7 +605,8 @@ class Application extends BaseApplication {
},
});
const toolsItems = toolsItemsFirst.concat([{
// we need this workaround, because on macOS the menu is different
const toolsItemsWindowsLinux = toolsItemsFirst.concat([{
label: _('Options'),
visible: !shim.isMac(),
accelerator: 'CommandOrControl+,',
@ -624,7 +616,23 @@ class Application extends BaseApplication {
routeName: 'Config',
});
},
}, resourceViewItem]);
}]);
// the following menu items will be available for all OS under Tools
const toolsItemsAll = [{
label: _('Resources'),
click: () => {
this.dispatch({
type: 'NAV_GO',
routeName: 'Resources',
});
},
}];
if (!shim.isMac()) {
toolsItems = toolsItems.concat(toolsItemsWindowsLinux);
}
toolsItems = toolsItems.concat(toolsItemsAll);
function _checkForUpdates(ctx) {
bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
@ -1028,7 +1036,7 @@ class Application extends BaseApplication {
},
tools: {
label: _('&Tools'),
submenu: shim.isMac() ? [] : toolsItems,
submenu: toolsItems,
},
help: {
label: _('&Help'),