about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-10-14 14:41:12 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-10-14 14:41:12 +0200
commitae716a12e1604a4df54acbc77ff35f591e3168e2 (patch)
tree5f3dbf5afd9458b8a353b03b8a0a59b3cd5d2607 /app/javascript
parentf63a40e7c2e3211758c321cdf9196d178c2930e0 (diff)
replace newlines in desktop notif with spaces instead of removing them (#5361)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/actions/notifications.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index c7d248122..b24ac8b73 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -31,6 +31,7 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
 
 const unescapeHTML = (html) => {
   const wrapper = document.createElement('div');
+  html = html.replace(/<br \/>|<br>|\n/, ' ');
   wrapper.innerHTML = html;
   return wrapper.textContent;
 };