diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js index 77e09eed..92aefad6 100644 --- a/browser/components/NoteItem.js +++ b/browser/components/NoteItem.js @@ -39,18 +39,16 @@ const TagElementList = (tags) => { * @param {boolean} isActive * @param {Object} note * @param {Function} handleNoteClick - * @param {Function} handleNoteContextMenu * @param {Function} handleDragStart * @param {string} dateDisplay */ -const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleNoteContextMenu, handleDragStart }) => ( +const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleDragStart }) => (
handleNoteClick(e, `${note.storage}-${note.key}`)} - onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)} onDragStart={e => handleDragStart(e, note)} draggable='true' > @@ -94,7 +92,6 @@ NoteItem.propTypes = { isStarred: PropTypes.bool.isRequired }), handleNoteClick: PropTypes.func.isRequired, - handleNoteContextMenu: PropTypes.func.isRequired, handleDragStart: PropTypes.func.isRequired, handleDragEnd: PropTypes.func.isRequired } diff --git a/browser/components/NoteItemSimple.js b/browser/components/NoteItemSimple.js index 2054f074..42cbe51a 100644 --- a/browser/components/NoteItemSimple.js +++ b/browser/components/NoteItemSimple.js @@ -10,17 +10,15 @@ import styles from './NoteItemSimple.styl' * @param {boolean} isActive * @param {Object} note * @param {Function} handleNoteClick - * @param {Function} handleNoteContextMenu * @param {Function} handleDragStart */ -const NoteItemSimple = ({ isActive, note, handleNoteClick, handleNoteContextMenum, handleDragStart }) => ( +const NoteItemSimple = ({ isActive, note, handleNoteClick, handleDragStart }) => (
handleNoteClick(e, `${note.storage}-${note.key}`)} - onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)} onDragStart={e => handleDragStart(e, note)} draggable='true' > @@ -46,7 +44,6 @@ NoteItemSimple.propTypes = { title: PropTypes.string.isrequired }), handleNoteClick: PropTypes.func.isRequired, - handleNoteContextMenu: PropTypes.func.isRequired, handleDragStart: PropTypes.func.isRequired } diff --git a/browser/finder/NoteList.js b/browser/finder/NoteList.js index 03ad786d..b82c3226 100644 --- a/browser/finder/NoteList.js +++ b/browser/finder/NoteList.js @@ -70,7 +70,6 @@ class NoteList extends React.Component { dateDisplay={dateDisplay} key={key} handleNoteClick={(e) => this.props.handleNoteClick(e, _index)} - handleNoteContextMenu={() => ''} /> ) }) diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 55ce4980..59da9c9b 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -264,49 +264,6 @@ class NoteList extends React.Component { }) } - handleNoteContextMenu (e, uniqueKey) { - let menu = new Menu() - menu.append(new MenuItem({ - label: 'Delete Note', - click: (e) => this.handleDeleteNote(e, uniqueKey) - })) - menu.popup() - } - - handleDeleteNote (e, uniqueKey) { - let index = dialog.showMessageBox(remote.getCurrentWindow(), { - type: 'warning', - message: 'Delete a note', - detail: 'This work cannot be undone.', - buttons: ['Confirm', 'Cancel'] - }) - if (index === 0) { - let { dispatch, location } = this.props - let splitted = uniqueKey.split('-') - let storageKey = splitted.shift() - let noteKey = splitted.shift() - - dataApi - .deleteNote(storageKey, noteKey) - .then((data) => { - let dispatchHandler = () => { - dispatch({ - type: 'DELETE_NOTE', - storageKey: data.storageKey, - noteKey: data.noteKey - }) - } - - if (location.query.key === uniqueKey) { - ee.once('list:moved', dispatchHandler) - ee.emit('list:next') - } else { - dispatchHandler() - } - }) - } - } - handleSortByChange (e) { let { dispatch } = this.props @@ -449,7 +406,6 @@ class NoteList extends React.Component { dateDisplay={dateDisplay} key={key} handleNoteClick={this.handleNoteClick.bind(this)} - handleNoteContextMenu={this.handleNoteContextMenu.bind(this)} handleDragStart={this.handleDragStart.bind(this)} /> ) @@ -461,7 +417,6 @@ class NoteList extends React.Component { note={note} key={key} handleNoteClick={this.handleNoteClick.bind(this)} - handleNoteContextMenu={this.handleNoteContextMenu.bind(this)} handleDragStart={this.handleDragStart.bind(this)} /> )