mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Style Guide: Additional message examples, a few fixes to enable

Browse source
This commit is contained in:
Scott Nonnenberg 2018-04-16 18:17:38 -07:00
parent 6a4acc813c
commit a563dc8b37
No known key found for this signature in database
GPG key ID: 5F82280C35134661
6 changed files with 272 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/messages.js
View file

@ -207,12 +207,12 @@
return ConversationController.getUnsafe(this.get('conversationId'));
},
getExpirationTimerUpdateSource() {
if (this.isExpirationTimerUpdate()) {
const conversationId = this.get('expirationTimerUpdate').source;
return ConversationController.getOrCreate(conversationId, 'private');
if (!this.isExpirationTimerUpdate()) {
throw new Error('Message is not a timer update!');
}
return Promise.resolve();
const conversationId = this.get('expirationTimerUpdate').source;
return ConversationController.getOrCreate(conversationId, 'private');
},
getContact() {
let conversationId = this.get('source');

6
js/views/message_view.js
View file

@ -45,8 +45,10 @@
tagName: 'span',
className: 'some-failed',
templateName: 'some-failed',
render_attributes: {
someFailed: i18n('someRecipientsFailed'),
render_attributes() {
return {
someFailed: i18n('someRecipientsFailed'),
};
},
});
const TimerView = Whisper.View.extend({