Disable keyboard shortcut for conversation archive

signalapp · Apr 17, 2019 · fca40cb · fca40cb
1 parent 0147169
commit fca40cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
@@ -1,5 +1,4 @@
 /* global
-  $,
   ConversationController,
   extension,
   getConversations,
@@ -8,6 +7,7 @@
   Whisper,
   textsecure,
   Signal
+
 */
 
 // eslint-disable-next-line func-names
@@ -150,23 +150,23 @@
       // In the future this listener will be added by the conversation view itself. But
       //   because we currently have multiple converations open at once, we install just
       //   one global handler.
-      $(document).on('keydown', event => {
-        const { ctrlKey, key } = event;
+      // $(document).on('keydown', event => {
+      //   const { ctrlKey, key } = event;
 
-        // We can add Command-E as the Mac shortcut when we add it to our Electron menus:
-        //   https://stackoverflow.com/questions/27380018/when-cmd-key-is-kept-pressed-keyup-is-not-triggered-for-any-other-key
-        // For now, it will stay as CTRL-E only
-        if (key === 'e' && ctrlKey) {
-          const state = this.store.getState();
-          const selectedId = state.conversations.selectedConversation;
-          const conversation = ConversationController.get(selectedId);
+      // We can add Command-E as the Mac shortcut when we add it to our Electron menus:
+      //   https://stackoverflow.com/questions/27380018/when-cmd-key-is-kept-pressed-keyup-is-not-triggered-for-any-other-key
+      // For now, it will stay as CTRL-E only
+      //   if (key === 'e' && ctrlKey) {
+      //     const state = this.store.getState();
+      //     const selectedId = state.conversations.selectedConversation;
+      //     const conversation = ConversationController.get(selectedId);
 
-          if (conversation && !conversation.get('isArchived')) {
-            conversation.setArchived(true);
-            conversation.trigger('unload');
-          }
-        }
-      });
+      //     if (conversation && !conversation.get('isArchived')) {
+      //       conversation.setArchived(true);
+      //       conversation.trigger('unload');
+      //     }
+      //   }
+      // });
 
       this.listenTo(convoCollection, 'remove', conversation => {
         const { id } = conversation || {};

diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
@@ -563,7 +563,7 @@
   {
     "rule": "jQuery-$(",
     "path": "js/views/inbox_view.js",
-    "line": "      $(document).on('keydown', event => {",
+    "line": "      // $(document).on('keydown', event => {",
     "lineNumber": 153,
     "reasonCategory": "usageTrusted",
     "updated": "2019-04-03T00:43:09.315Z",