Merge branch 'mentions-fix' into 'develop'
Make mention links internal, fixes #74 Closes #74 See merge request gab/social/gab-social!34
This commit is contained in:
commit
447478a791
@ -45,7 +45,7 @@ export default class StatusContent extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
link.classList.add('status-link');
|
link.classList.add('status-link');
|
||||||
|
|
||||||
let mention = this.props.status.get('mentions').find(item => link.href === `/${item.get('acct')}`);
|
let mention = this.props.status.get('mentions').find(item => link.href === `${item.get('url')}`);
|
||||||
|
|
||||||
if (mention) {
|
if (mention) {
|
||||||
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
|
||||||
@ -139,7 +139,7 @@ export default class StatusContent extends React.PureComponent {
|
|||||||
const { status, reblogContent } = this.props;
|
const { status, reblogContent } = this.props;
|
||||||
|
|
||||||
const properContent = status.get('contentHtml');
|
const properContent = status.get('contentHtml');
|
||||||
|
|
||||||
return reblogContent
|
return reblogContent
|
||||||
? `${reblogContent} <div class='status__quote'>${properContent}</div>`
|
? `${reblogContent} <div class='status__quote'>${properContent}</div>`
|
||||||
: properContent;
|
: properContent;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user