diff options
| author | Matthias Jouan <matthias.jouan@gmail.com> | 2017-04-11 00:35:35 +0200 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-11 00:35:35 +0200 |
| commit | 3fd5385e7b038bce4da566bcd193f0fd1e2c5383 (patch) | |
| tree | 1c7f790ccd2c72e1c3ab01aecc9ad0674f57fa06 /app/assets/javascripts | |
| parent | d439855a6d04ff04a187b4a1ded03c6ee2bc062e (diff) | |
Add username as a title for mentions (#1385)
Add a title attribute on mention links for both notifications and mentions in statuses. Related to #1350
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/notifications/components/notification.jsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index e0cca6113..9cf03bb32 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -36,6 +36,7 @@ const StatusContent = React.createClass({ if (mention) { link.addEventListener('click', this.onMentionClick.bind(this, mention), false); + link.setAttribute('title', mention.get('acct')); } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) { link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false); } else if (media) { diff --git a/app/assets/javascripts/components/features/notifications/components/notification.jsx b/app/assets/javascripts/components/features/notifications/components/notification.jsx index c9279b20e..0607466d0 100644 --- a/app/assets/javascripts/components/features/notifications/components/notification.jsx +++ b/app/assets/javascripts/components/features/notifications/components/notification.jsx @@ -76,7 +76,7 @@ const Notification = React.createClass({ const account = notification.get('account'); const displayName = account.get('display_name').length > 0 ? account.get('display_name') : account.get('username'); const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) }; - const link = <Permalink className='notification__display-name' style={linkStyle} href={account.get('url')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHTML} />; + const link = <Permalink className='notification__display-name' style={linkStyle} href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHTML} />; switch(notification.get('type')) { case 'follow': |