diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-13 19:23:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 19:23:36 +0200 |
| commit | 043862f4118a9ee5e6708ff9c144fa9e668ee06d (patch) | |
| tree | 5e8bb2db27240c95854cd3eefd4b8db56696afa2 /app | |
| parent | 9e5c1c487eadd1720dc147898a676ddb0038bde2 (diff) | |
Fix #1609, fix #1628 - Revert #1397 (#1700)
When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Additional fix: reset NSFW toggle after sending toot
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/reducers/compose.jsx | 1 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index 9cf03bb32..c7eefcaf5 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -92,7 +92,7 @@ const StatusContent = React.createClass({ const { status } = this.props; const { hidden } = this.state; - const content = { __html: emojify(status.get('content')).replace(/\n/g, '') }; + const content = { __html: emojify(status.get('content')) }; const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) }; const directionStyle = { direction: 'ltr' }; diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx index 86974239b..7349cc351 100644 --- a/app/assets/javascripts/components/reducers/compose.jsx +++ b/app/assets/javascripts/components/reducers/compose.jsx @@ -67,6 +67,7 @@ function clearAll(state) { map.set('is_submitting', false); map.set('in_reply_to', null); map.set('privacy', state.get('default_privacy')); + map.set('sensitive', false); map.update('media_attachments', list => list.clear()); }); }; diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index b6d371ed2..64349e68e 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -15,6 +15,7 @@ class Formatter html = status.text html = encode(html) html = simple_format(html, {}, sanitize: false) + html = html.gsub(/\n/, '') html = link_urls(html) html = link_mentions(html, status.mentions) html = link_hashtags(html) |