Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[GH-15740] channel mentions in message attachments #6628

Merged
merged 5 commits into from
Oct 27, 2020
Merged

[GH-15740] channel mentions in message attachments #6628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab43bcf
fix(15740): channel mention and link in message attachement
jufab Oct 4, 2020
4c0f2e5
fix: update test snapshot
jufab Oct 4, 2020
7b42d43
fix: revert package-lock.json
jufab Oct 6, 2020
ef46fe5
Merge branch 'master' into master
mattermod Oct 13, 2020
dfc269f
Merge branch 'master' into master
mattermod Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(15740): channel mention and link in message attachement
  • Loading branch information
@jufab
jufab committed Oct 4, 2020
commit ab43bcff22b693a5121f384b4823daf96f74da64
2 changes: 1 addition & 1 deletion components/post_view/message_attachments/message_attachment/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import MessageAttachment from './message_attachment';

function mapStateToProps(state) {
return {
getCurrentRelativeTeamUrl: getCurrentRelativeTeamUrl(state),
currentRelativeTeamUrl: getCurrentRelativeTeamUrl(state),
};
}

Expand Down
2 changes: 1 addition & 1 deletion components/post_view/message_attachments/message_attachment/message_attachment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ export default class MessageAttachment extends React.PureComponent {
<div
className={'attachment ' + preTextClass}
ref='attachment'
onClick={this.handleFormattedTextClick}
>
{preText}
<div className='attachment__content'>
Expand All @@ -490,7 +491,6 @@ export default class MessageAttachment extends React.PureComponent {
<div>
<div
className={thumb ? 'attachment__body' : 'attachment__body attachment__body--no_thumb'}
onClick={this.handleFormattedTextClick}
>
{attachmentText}
{image}
Expand Down
Loading