Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 04:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make quote props consistent, white circle dark theme play overlay

Browse Source 
Prevents errors in the logs about attempting to load images from their
relative patn instead of the absolute path. No effect on the user.
This commit is contained in:
Scott Nonnenberg
2018-07-18 12:20:14 -07:00
parent 5e64e4ef40
commit c2c8dc5090
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/models/messages.js
View File

@@ -280,17 +280,15 @@
return ConversationController.get(author);
},
processAttachment(attachment, externalObjectUrl) {
processQuoteAttachment(attachment, externalObjectUrl) {
const { thumbnail } = attachment;
const objectUrl = (thumbnail && thumbnail.objectUrl) || externalObjectUrl;
const path = thumbnail && thumbnail.path;
const thumbnailWithObjectUrl =
!objectUrl && !path
? null
: Object.assign({}, attachment.thumbnail || {}, {
objectUrl: objectUrl || path,
});
const thumbnailWithObjectUrl = !objectUrl
? null
: Object.assign({}, attachment.thumbnail || {}, {
objectUrl,
});
return Object.assign({}, attachment, {
isVoiceMessage: Signal.Types.Attachment.isVoiceMessage(attachment),
@@ -590,7 +588,7 @@
return {
text: this.createNonBreakingLastSeparator(quote.text),
attachment: firstAttachment
? this.processAttachment(firstAttachment, objectUrl)
? this.processQuoteAttachment(firstAttachment, objectUrl)
: null,
isFromMe,
authorPhoneNumber,