Browse Source

Keep newlines in xml (#1397)

pull/4/head
Rachel H 5 years ago
committed by Eugen
parent
commit
f690320fb9
2 changed files with 1 additions and 2 deletions
  1. +1
    -1
      app/assets/javascripts/components/components/status_content.jsx
  2. +0
    -1
      app/lib/formatter.rb

+ 1
- 1
app/assets/javascripts/components/components/status_content.jsx View File

@ -91,7 +91,7 @@ const StatusContent = React.createClass({
const { status } = this.props;
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 directionStyle = { direction: 'ltr' };

+ 0
- 1
app/lib/formatter.rb View File

@ -15,7 +15,6 @@ 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)

Loading…
Cancel
Save