keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Merge signal 1.24.1

Browse Source
pull/272/head
Mikunj 7 years ago
parent 8808100796 d934e2cd48
commit 61b862b021
5 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File

3
config/default.json
Unescape Escape View File

@ -7,7 +7,8 @@
"snodeServerPort": "8080", "snodeServerPort": "8080",
"disableAutoUpdate": false, "disableAutoUpdate": false,
"updatesUrl": "https://updates2.signal.org/desktop", "updatesUrl": "https://updates2.signal.org/desktop",
"updatesPublicKey": "fd7dd3de7149dc0a127909fee7de0f7620ddd0de061b37a2c303e37de802a401", "updatesPublicKey":
"fd7dd3de7149dc0a127909fee7de0f7620ddd0de061b37a2c303e37de802a401",
"updatesEnabled": false, "updatesEnabled": false,
"openDevTools": false, "openDevTools": false,
"buildExpiration": 0, "buildExpiration": 0,

35
js/views/inbox_view.js
Unescape Escape View File

@ -1,5 +1,4 @@
/* global /* global
$,
ConversationController, ConversationController,
extension, extension,
ConversationController ConversationController
@ -187,23 +186,23 @@
// In the future this listener will be added by the conversation view itself. But // 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 // because we currently have multiple converations open at once, we install just
// one global handler. // one global handler.
$(document).on('keydown', event => { // $(document).on('keydown', event => {
const { ctrlKey, key } = event; // const { ctrlKey, key } = event;
// We can add Command-E as the Mac shortcut when we add it to our Electron menus: // 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 // 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 // For now, it will stay as CTRL-E only
if (key === 'e' && ctrlKey) { // if (key === 'e' && ctrlKey) {
const state = this.store.getState(); // const state = this.store.getState();
const selectedId = state.conversations.selectedConversation; // const selectedId = state.conversations.selectedConversation;
const conversation = ConversationController.get(selectedId); // const conversation = ConversationController.get(selectedId);
if (conversation && !conversation.get('isArchived')) { // if (conversation && !conversation.get('isArchived')) {
conversation.setArchived(true); // conversation.setArchived(true);
conversation.trigger('unload'); // conversation.trigger('unload');
} // }
} // }
}); // });
this.listenTo(convoCollection, 'remove', conversation => { this.listenTo(convoCollection, 'remove', conversation => {
const { id } = conversation || {}; const { id } = conversation || {};

9
stylesheets/_modules.scss
Unescape Escape View File

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

2
ts/util/lint/exceptions.json
Unescape Escape View File

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

13
yarn.lock
Unescape Escape View File

@ -1195,19 +1195,6 @@ buble@^0.19.3:
os-homedir "^1.0.1" os-homedir "^1.0.1"
vlq "^1.0.0" 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"
buffer-crc32@0.2.13, buffer-crc32@^0.2.1: buffer-crc32@0.2.13, buffer-crc32@^0.2.1:
version "0.2.13" version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"

Write Preview
Loading…
Cancel
Save