Preserve newlines in delete & redraft and desktop notifications (#7750)

Fix #7748
2018-06-06 20:49:53 +02:00
parent b7b331ad0d
commit c75493755f
2 changed files with 5 additions and 5 deletions
--- a/app/javascript/mastodon/utils/html.js
+++ b/app/javascript/mastodon/utils/html.js
@ -1,6 +1,5 @@
 export const unescapeHTML = (html) => {
  const wrapper = document.createElement('div');
-  html = html.replace(/<br \/>|<br>|\n/g, ' ');
-  wrapper.innerHTML = html;
+  wrapper.innerHTML = html.replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n').replace(/<[^>]*>/g, '');
  return wrapper.textContent;
 };