self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-13 22:12:50 +02:00
Code Issues Releases Activity

Desktop: Fixes #3331: Fixed note list context menu

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-06 15:47:02 +01:00
parent f23ab37a11
commit a3153f1c9f
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintignore
View File

@@ -97,8 +97,6 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
ReactNativeClient/lib/JoplinServerApi.js ReactNativeClient/lib/JoplinServerApi.js
ReactNativeClient/lib/ShareExtension.js
ReactNativeClient/lib/shareHandler.js
ReactNativeClient/lib/services/keychain/KeychainService.js ReactNativeClient/lib/services/keychain/KeychainService.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
@@ -106,6 +104,8 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
ReactNativeClient/lib/services/ResourceEditWatcher.js ReactNativeClient/lib/services/ResourceEditWatcher.js
ReactNativeClient/lib/services/SettingUtils.js ReactNativeClient/lib/services/SettingUtils.js
ReactNativeClient/lib/ShareExtension.js
ReactNativeClient/lib/shareHandler.js
ReactNativeClient/PluginAssetsLoader.js ReactNativeClient/PluginAssetsLoader.js
ReactNativeClient/setUpQuickActions.js ReactNativeClient/setUpQuickActions.js
# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

4
.gitignore vendored
View File

@@ -87,8 +87,6 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
ReactNativeClient/lib/JoplinServerApi.js ReactNativeClient/lib/JoplinServerApi.js
ReactNativeClient/lib/ShareExtension.js
ReactNativeClient/lib/shareHandler.js
ReactNativeClient/lib/services/keychain/KeychainService.js ReactNativeClient/lib/services/keychain/KeychainService.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
@@ -96,6 +94,8 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
ReactNativeClient/lib/services/ResourceEditWatcher.js ReactNativeClient/lib/services/ResourceEditWatcher.js
ReactNativeClient/lib/services/SettingUtils.js ReactNativeClient/lib/services/SettingUtils.js
ReactNativeClient/lib/ShareExtension.js
ReactNativeClient/lib/shareHandler.js
ReactNativeClient/PluginAssetsLoader.js ReactNativeClient/PluginAssetsLoader.js
ReactNativeClient/setUpQuickActions.js ReactNativeClient/setUpQuickActions.js
# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

2
ElectronClient/gui/NoteList.jsx
View File

@@ -36,6 +36,7 @@ class NoteListComponent extends React.Component {
this.onGlobalDrop_ = this.onGlobalDrop_.bind(this); this.onGlobalDrop_ = this.onGlobalDrop_.bind(this);
this.registerGlobalDragEndEvent_ = this.registerGlobalDragEndEvent_.bind(this); this.registerGlobalDragEndEvent_ = this.registerGlobalDragEndEvent_.bind(this);
this.unregisterGlobalDragEndEvent_ = this.unregisterGlobalDragEndEvent_.bind(this); this.unregisterGlobalDragEndEvent_ = this.unregisterGlobalDragEndEvent_.bind(this);
this.itemContextMenu = this.itemContextMenu.bind(this);
} }
style() { style() {
@@ -250,6 +251,7 @@ class NoteListComponent extends React.Component {
onNoteDragOver={this.noteItem_noteDragOver} onNoteDragOver={this.noteItem_noteDragOver}
onNoteDrop={this.noteItem_noteDrop} onNoteDrop={this.noteItem_noteDrop}
onTitleClick={this.noteItem_titleClick} onTitleClick={this.noteItem_titleClick}
onContextMenu={this.itemContextMenu}
/>; />;
} }

3
ElectronClient/gui/NoteListItem.tsx
View File

@@ -23,6 +23,7 @@ interface NoteListItemProps {
onNoteDragOver: any, onNoteDragOver: any,
onNoteDrop: any, onNoteDrop: any,
onTitleClick: any, onTitleClick: any,
onContextMenu(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>): void,
} }
function NoteListItem(props:NoteListItemProps, ref:any) { function NoteListItem(props:NoteListItemProps, ref:any) {
@@ -126,7 +127,7 @@ function NoteListItem(props:NoteListItemProps, ref:any) {
{renderCheckbox()} {renderCheckbox()}
<a <a
ref={anchorRef} ref={anchorRef}
onContextMenu={event => this.itemContextMenu(event)} onContextMenu={props.onContextMenu}
href="#" href="#"
draggable={true} draggable={true}
style={listItemTitleStyle} style={listItemTitleStyle}