diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-26 18:48:56 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-26 18:48:56 +0100 |
commit | 7329fbd8a453bbd2fcbec8bd63b1390bfe7bc7b8 (patch) | |
tree | 42b73ff36fc0e7758ac9754ae512c1e5cc612412 /app/assets/javascripts/components/actions/notifications.jsx | |
parent | cc5c1e5febf588183145e30dc7e98e5ea33cd398 (diff) |
Fix up timeout, improve contrast on "show more", add responsive style
for extremely wide monitors
Diffstat (limited to 'app/assets/javascripts/components/actions/notifications.jsx')
-rw-r--r-- | app/assets/javascripts/components/actions/notifications.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/actions/notifications.jsx b/app/assets/javascripts/components/actions/notifications.jsx index 1731c1857..4caf9c75b 100644 --- a/app/assets/javascripts/components/actions/notifications.jsx +++ b/app/assets/javascripts/components/actions/notifications.jsx @@ -40,7 +40,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) { // Desktop notifications if (typeof window.Notification !== 'undefined' && showAlert) { const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); - const body = $('<p>').html(notification.status ? notification.status.content : '').text(); + const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : $('<p>').html(notification.status ? notification.status.content : '').text(); new Notification(title, { body, icon: notification.account.avatar, tag: notification.id }); } |