Merge signal 1.24.1

sachaaaaa · Apr 18, 2019 · 61b862b · 61b862b
2 parents 8808100 + d934e2c
commit 61b862b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 37 deletions.
diff --git a/config/default.json b/config/default.json
@@ -7,7 +7,8 @@
   "snodeServerPort": "8080",
   "disableAutoUpdate": false,
   "updatesUrl": "https://updates2.signal.org/desktop",
-  "updatesPublicKey": "fd7dd3de7149dc0a127909fee7de0f7620ddd0de061b37a2c303e37de802a401",
+  "updatesPublicKey":
+    "fd7dd3de7149dc0a127909fee7de0f7620ddd0de061b37a2c303e37de802a401",
   "updatesEnabled": false,
   "openDevTools": false,
   "buildExpiration": 0,

diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
@@ -1,5 +1,4 @@
 /* global
-  $,
   ConversationController,
   extension,
   ConversationController
@@ -187,23 +186,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;
-
-        // 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');
-          }
-        }
-      });
+      // $(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);
+
+      //     if (conversation && !conversation.get('isArchived')) {
+      //       conversation.setArchived(true);
+      //       conversation.trigger('unload');
+      //     }
+      //   }
+      // });
 
       this.listenTo(convoCollection, 'remove', conversation => {
         const { id } = conversation || {};

diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
@@ -3010,7 +3010,7 @@
 // Module: Search Results
 
 .module-search-results {
-  overflow-y: scroll;
+  overflow-y: auto;
   max-height: 100%;
   color: white;
 }
@@ -3250,9 +3250,7 @@
   flex-direction: row;
   align-items: center;
 
-  padding-top: 8px;
-  padding-bottom: 8px;
-  padding-left: 16px;
+  padding: 8px 16px;
 
   cursor: pointer;
 
@@ -3262,10 +3260,13 @@
 }
 
 .module-start-new-conversation__content {
+  overflow: hidden;
   margin-left: 12px;
 }
 
 .module-start-new-conversation__number {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
   font-weight: 300;
 }
 

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",

diff --git a/yarn.lock b/yarn.lock
@@ -1195,19 +1195,6 @@ buble@^0.19.3:
     os-homedir "^1.0.1"
     vlq "^1.0.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
 [email protected], buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"