mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-12-04 17:58:17 +09:00
Code

Keep newlines in xml (#1397)

Browse Source
This commit is contained in:
Rachel H 2017-04-10 12:32:45 -07:00 committed by Eugen
parent 553170b77a
commit f690320fb9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status_content.jsx
View File

@ -91,7 +91,7 @@ const StatusContent = React.createClass({
const { status } = this.props; const { status } = this.props;
const { hidden } = this.state; const { hidden } = this.state;
const content = { __html: emojify(status.get('content')) }; const content = { __html: emojify(status.get('content')).replace(/\n/g, '') };
const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) }; const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };
const directionStyle = { direction: 'ltr' }; const directionStyle = { direction: 'ltr' };

1
app/lib/formatter.rb
View File

@ -15,7 +15,6 @@ class Formatter
html = status.text html = status.text
html = encode(html) html = encode(html)
html = simple_format(html, {}, sanitize: false) html = simple_format(html, {}, sanitize: false)
html = html.gsub(/\n/, '')
html = link_urls(html) html = link_urls(html)
html = link_mentions(html, status.mentions) html = link_mentions(html, status.mentions)
html = link_hashtags(html) html = link_hashtags(html)