Make quote props consistent, white circle dark theme play overlay
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:
@@ -800,7 +800,7 @@
|
|||||||
thumbnail: thumbnail
|
thumbnail: thumbnail
|
||||||
? {
|
? {
|
||||||
...(await loadAttachmentData(thumbnail)),
|
...(await loadAttachmentData(thumbnail)),
|
||||||
path: getAbsoluteAttachmentPath(thumbnail.path),
|
objectUrl: getAbsoluteAttachmentPath(thumbnail.path),
|
||||||
}
|
}
|
||||||
: null,
|
: null,
|
||||||
};
|
};
|
||||||
|
@@ -280,16 +280,14 @@
|
|||||||
|
|
||||||
return ConversationController.get(author);
|
return ConversationController.get(author);
|
||||||
},
|
},
|
||||||
processAttachment(attachment, externalObjectUrl) {
|
processQuoteAttachment(attachment, externalObjectUrl) {
|
||||||
const { thumbnail } = attachment;
|
const { thumbnail } = attachment;
|
||||||
const objectUrl = (thumbnail && thumbnail.objectUrl) || externalObjectUrl;
|
const objectUrl = (thumbnail && thumbnail.objectUrl) || externalObjectUrl;
|
||||||
const path = thumbnail && thumbnail.path;
|
|
||||||
|
|
||||||
const thumbnailWithObjectUrl =
|
const thumbnailWithObjectUrl = !objectUrl
|
||||||
!objectUrl && !path
|
|
||||||
? null
|
? null
|
||||||
: Object.assign({}, attachment.thumbnail || {}, {
|
: Object.assign({}, attachment.thumbnail || {}, {
|
||||||
objectUrl: objectUrl || path,
|
objectUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
return Object.assign({}, attachment, {
|
return Object.assign({}, attachment, {
|
||||||
@@ -590,7 +588,7 @@
|
|||||||
return {
|
return {
|
||||||
text: this.createNonBreakingLastSeparator(quote.text),
|
text: this.createNonBreakingLastSeparator(quote.text),
|
||||||
attachment: firstAttachment
|
attachment: firstAttachment
|
||||||
? this.processAttachment(firstAttachment, objectUrl)
|
? this.processQuoteAttachment(firstAttachment, objectUrl)
|
||||||
: null,
|
: null,
|
||||||
isFromMe,
|
isFromMe,
|
||||||
authorPhoneNumber,
|
authorPhoneNumber,
|
||||||
|
@@ -942,7 +942,7 @@ body.dark-theme {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.module-quote__icon-container__circle-background {
|
.module-quote__icon-container__circle-background {
|
||||||
background-color: $color-black;
|
background-color: $color-white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.module-quote__icon-container__icon--file {
|
.module-quote__icon-container__icon--file {
|
||||||
|
Reference in New Issue
Block a user