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

Message Requests

Browse source
This commit is contained in:
Ken Powers 2020-05-27 17:37:06 -04:00 • committed by Scott Nonnenberg
parent 4d4b7a26a5
commit 83574eb067
60 changed files with 2566 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ts/components/conversation/Message.tsx
View file

@ -573,6 +573,9 @@ export class Message extends React.PureComponent<Props, State> {
withContentBelow
? 'module-message__attachment-container--with-content-below'
: null,
collapseMetadata
? 'module-message__attachment-container--with-collapsed-metadata'
: null,
isSticker && !collapseMetadata
? 'module-message__sticker-container--with-content-below'
: null
@ -627,6 +630,9 @@ export class Message extends React.PureComponent<Props, State> {
: null,
withContentAbove
? 'module-message__generic-attachment--with-content-above'
: null,
!firstAttachment.url
? 'module-message__generic-attachment--not-active'
: null
)}
// There's only ever one of these, so we don't want users to tab into it
@ -635,6 +641,10 @@ export class Message extends React.PureComponent<Props, State> {
event.stopPropagation();
event.preventDefault();
if (!firstAttachment.url) {
return;
}
this.openGenericAttachment();
}}
>
@ -1117,7 +1127,7 @@ export class Message extends React.PureComponent<Props, State> {
)}
>
{canReply ? reactButton : null}
{downloadButton}
{canReply ? downloadButton : null}
{canReply ? replyButton : null}
{menuButton}
</div>
@ -1881,6 +1891,15 @@ export class Message extends React.PureComponent<Props, State> {
return;
}
// If there an incomplete attachment, do not execute the default action
const { attachments } = this.props;
if (attachments && attachments.length > 0) {
const [firstAttachment] = attachments;
if (!firstAttachment.url) {
return;
}
}
this.handleOpen(event);
};