diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-05-12 22:03:43 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-13 04:03:43 +0200 |
| commit | 3dcb5fa28f13f597d49b5b442f61d12bc2be6152 (patch) | |
| tree | 50d9b18404756964d7c368e6d79562be478a61f4 /app/javascript/mastodon/actions/notifications.js | |
| parent | 1d5dcfcd46b973791c4f19f1dd66f33f3498800a (diff) | |
Revert HTML CW changes (#3020)
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
Diffstat (limited to 'app/javascript/mastodon/actions/notifications.js')
| -rw-r--r-- | app/javascript/mastodon/actions/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 323e2e9b6..da3d562d5 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -53,7 +53,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 = (notification.status && notification.status.spoiler_text.length > 0) ? unescapeHTML(notification.status.spoiler_text) : unescapeHTML(notification.status ? notification.status.content : ''); + const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : ''); const notify = new Notification(title, { body, icon: notification.account.avatar, tag: notification.id }); notify.addEventListener('click', () => { |