colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't reset panel on close of recent media pane

Browse Source
This commit is contained in:
Josh Perez
2020-07-14 19:21:25 -04:00
committed by Scott Nonnenberg
parent 901179440f
commit 9433a1de99
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/views/conversation_view.js
View File

@@ -1966,7 +1966,6 @@
props: await getProps(), props: await getProps(),
onClose: () => { onClose: () => {
this.stopListening(this.model.messageCollection, 'remove', update); this.stopListening(this.model.messageCollection, 'remove', update);
this.resetPanel();
}, },
}); });

13
js/views/key_verification_view.js
View File

@@ -1,4 +1,4 @@
/* global Whisper, Signal */ /* global Backbone, Signal, Whisper */
/* eslint-disable more/no-then */ /* eslint-disable more/no-then */
@@ -14,7 +14,7 @@
initialize(options) { initialize(options) {
this.render(); this.render();
const view = new Whisper.ReactWrapperView({ this.view = new Whisper.ReactWrapperView({
JSX: Signal.State.Roots.createSafetyNumberViewer(window.reduxStore, { JSX: Signal.State.Roots.createSafetyNumberViewer(window.reduxStore, {
contactID: options.model.get('id'), contactID: options.model.get('id'),
}), }),
@@ -25,7 +25,14 @@
}, },
}); });
this.$('.key-verification-wrapper').append(view.el); this.$('.key-verification-wrapper').append(this.view.el);
},
remove() {
if (this.view) {
this.view.remove();
}
Backbone.View.prototype.remove.call(this);
}, },
}); });
})(); })();

4
ts/util/lint/exceptions.json
View File

@@ -694,7 +694,7 @@
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/key_verification_view.js", "path": "js/views/key_verification_view.js",
"line": " this.$('.key-verification-wrapper').append(view.el);", "line": " this.$('.key-verification-wrapper').append(this.view.el);",
"lineNumber": 28, "lineNumber": 28,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-06-23T06:48:06.829Z" "updated": "2020-06-23T06:48:06.829Z"
@@ -702,7 +702,7 @@
{ {
"rule": "jQuery-append(", "rule": "jQuery-append(",
"path": "js/views/key_verification_view.js", "path": "js/views/key_verification_view.js",
"line": " this.$('.key-verification-wrapper').append(view.el);", "line": " this.$('.key-verification-wrapper').append(this.view.el);",
"lineNumber": 28, "lineNumber": 28,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-06-23T06:48:06.829Z" "updated": "2020-06-23T06:48:06.829Z"