From f77fc700d14d2f5b00e1e2a27a78038e6493db61 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Mon, 9 May 2016 16:21:27 -0700
Subject: [PATCH] fix(drafts): Support additional deletion shortcuts #939

---
 internal_packages/draft-list/lib/draft-list.cjsx          | 2 ++
 .../thread-list/lib/thread-toolbar-buttons.jsx            | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/internal_packages/draft-list/lib/draft-list.cjsx b/internal_packages/draft-list/lib/draft-list.cjsx
index 025a10e95..135ac031c 100644
--- a/internal_packages/draft-list/lib/draft-list.cjsx
+++ b/internal_packages/draft-list/lib/draft-list.cjsx
@@ -34,6 +34,8 @@ class DraftList extends React.Component
     props
 
   _keymapHandlers: =>
+    'core:delete-item': @_onRemoveFromView
+    'core:gmail-remove-from-view': @_onRemoveFromView
     'core:remove-from-view': @_onRemoveFromView
 
   _onDoubleClick: (draft) =>
diff --git a/internal_packages/thread-list/lib/thread-toolbar-buttons.jsx b/internal_packages/thread-list/lib/thread-toolbar-buttons.jsx
index f7bb5f291..3f300aaf9 100644
--- a/internal_packages/thread-list/lib/thread-toolbar-buttons.jsx
+++ b/internal_packages/thread-list/lib/thread-toolbar-buttons.jsx
@@ -231,7 +231,9 @@ class ThreadArrowButton extends React.Component {
     command: React.PropTypes.string,
     title: React.PropTypes.string,
   }
-  constructor() {
+
+  constructor(props) {
+    super(props);
     this.state = this.props.getStateFromStores();
   }
 
@@ -245,7 +247,7 @@ class ThreadArrowButton extends React.Component {
     this._unsubscribe_focus();
   }
 
-  _onClick() {
+  _onClick = () => {
     if (this.state.disabled) {
       return;
     }
@@ -253,7 +255,7 @@ class ThreadArrowButton extends React.Component {
     return;
   }
 
-  _onStoreChange() {
+  _onStoreChange = () => {
     this.setState(this.props.getStateFromStores());
   }