Merge pull request #2452 from jacobherrington/add-delete-hotkey

Add delete hotkey

browser/main/Detail/MarkdownNoteDetail.js

@@ -61,6 +61,7 @@ class MarkdownNoteDetail extends React.Component {
       const reversedType = this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
       this.handleSwitchMode(reversedType)
     })
+    ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this))
     ee.on('code:generate-toc', this.generateToc)
   }
 
@@ -295,6 +296,10 @@ class MarkdownNoteDetail extends React.Component {
     })
   }
 
+  handleDeleteNote () {
+    this.handleTrashButtonClick()
+  }
+
   handleClearTodo () {
     const { note } = this.state
     const splitted = note.content.split('\n')

browser/main/lib/ConfigManager.js

@@ -24,7 +24,8 @@ export const DEFAULT_CONFIG = {
   amaEnabled: true,
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
-    toggleMode: OSX ? 'Command + Option + M' : 'Ctrl + M'
+    toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
+    deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace'
   },
   ui: {
     language: 'en',

browser/main/lib/shortcut.js

@@ -3,5 +3,8 @@ import ee from 'browser/main/lib/eventEmitter'
 module.exports = {
   'toggleMode': () => {
     ee.emit('topbar:togglemodebutton')
+  },
+  'deleteNote': () => {
+    ee.emit('hotkey:deletenote')
   }
 }

browser/main/modals/PreferencesModal/HotkeyTab.js

@@ -68,7 +68,8 @@ class HotkeyTab extends React.Component {
     const { config } = this.state
     config.hotkey = {
       toggleMain: this.refs.toggleMain.value,
-      toggleMode: this.refs.toggleMode.value
+      toggleMode: this.refs.toggleMode.value,
+      deleteNote: this.refs.deleteNote.value
     }
     this.setState({
       config
@@ -127,6 +128,17 @@ class HotkeyTab extends React.Component {
               />
             </div>
           </div>
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>{i18n.__('Delete Note')}</div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                onChange={(e) => this.handleHotkeyChange(e)}
+                ref='deleteNote'
+                value={config.hotkey.deleteNote}
+                type='text'
+              />
+            </div>
+          </div>
           <div styleName='group-control'>
             <button styleName='group-control-leftButton'
               onClick={(e) => this.handleHintToggleButtonClick(e)}