self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Desktop: Fixed regression: Several menu items did not work anymore

Browse Source
This commit is contained in:
Laurent Cozic
2020-08-18 21:45:22 +01:00
parent 0b57d906f8
commit 157736ff7e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ElectronClient/gui/SideBar/SideBar.jsx
View File

@@ -255,7 +255,7 @@ class SideBarComponent extends React.Component {
if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
menu.append(
new MenuItem(CommandService.instance().commandToMenuItem('newNotebook', null, { parentId: itemId }))
new MenuItem(CommandService.instance().commandToMenuItem('newNotebook', { parentId: itemId }))
);
}
@@ -284,7 +284,7 @@ class SideBarComponent extends React.Component {
);
if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
menu.append(new MenuItem(CommandService.instance().commandToMenuItem('renameFolder', null, { folderId: itemId })));
menu.append(new MenuItem(CommandService.instance().commandToMenuItem('renameFolder', { folderId: itemId })));
menu.append(new MenuItem({ type: 'separator' }));
@@ -317,7 +317,7 @@ class SideBarComponent extends React.Component {
if (itemType === BaseModel.TYPE_TAG) {
menu.append(new MenuItem(
CommandService.instance().commandToMenuItem('renameTag', null, { tagId: itemId })
CommandService.instance().commandToMenuItem('renameTag', { tagId: itemId })
));
}

8
ElectronClient/gui/utils/NoteListUtils.js
View File

@@ -48,11 +48,11 @@ class NoteListUtils {
if (props.watchedNoteFiles.indexOf(noteIds[0]) < 0) {
menu.append(
new MenuItem(cmdService.commandToMenuItem('startExternalEditing', null, { noteId: noteIds[0] }))
new MenuItem(cmdService.commandToMenuItem('startExternalEditing', { noteId: noteIds[0] }))
);
} else {
menu.append(
new MenuItem(cmdService.commandToMenuItem('stopExternalEditing', null, { noteId: noteIds[0] }))
new MenuItem(cmdService.commandToMenuItem('stopExternalEditing', { noteId: noteIds[0] }))
);
}
@@ -122,7 +122,7 @@ class NoteListUtils {
menu.append(
new MenuItem(
cmdService.commandToMenuItem('showShareNoteDialog', null, { noteIds: noteIds.slice() })
cmdService.commandToMenuItem('showShareNoteDialog', { noteIds: noteIds.slice() })
)
);
@@ -147,7 +147,7 @@ class NoteListUtils {
exportMenu.append(
new MenuItem(
cmdService.commandToMenuItem('exportPdf', null, { noteIds: noteIds })
cmdService.commandToMenuItem('exportPdf', { noteIds: noteIds })
)
);

2
package.json
View File

@@ -5,7 +5,7 @@
"scripts": {
"linter": "./node_modules/.bin/eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
"linter-ci": "./node_modules/.bin/eslint --ext .js --ext .jsx --ext .ts --ext .tsx",
"watch": "node_modules/typescript/bin/tsc --watch --project tsconfig.dev.json",
"watch": "node node_modules/typescript/bin/tsc --watch --project tsconfig.dev.json",
"build": "gulp build",
"postinstall": "cd Tools && npm i && cd .. && cd ReactNativeClient && npm i && cd .. && cd ElectronClient && npm i && cd .. && cd CliClient && npm i && cd .. && gulp build"
},