Download as
Browse Code »

Commit e1c95655a231e4eadfd9500c7c763c8e9d9afc57

Authored by Antonio Terceiro
Committed by Joenio Costa
1 parent 1607e1bb
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Disable hard line breaks 

Without this, single line breaks withing a paragraph get translated to a
HTML <br/>, which is completely annoying *and* counter-intuitive in
comparison with most markup languages like Textile.
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/models/textile_article.rb
  Diff comments   View file @e1c9565
... ... @@ -28,7 +28,9 @@ class TextileArticle &lt; TextArticle
28 28  
29 29 def convert_to_html(textile)
30 30 @@sanitizer ||= HTML::WhiteListSanitizer.new
31   - @@sanitizer.sanitize(RedCloth.new(textile|| '').to_html)
  31 + converter = RedCloth.new(textile|| '')
  32 + converter.hard_breaks = false
  33 + @@sanitizer.sanitize(converter.to_html)
32 34 end
33 35  
34 36 end
... ...
test/unit/textile_article_test.rb
  Diff comments   View file @e1c9565
... ... @@ -182,6 +182,10 @@ class TextileArticleTest &lt; Test::Unit::TestCase
182 182 assert_not_equal '<script>alert(1)</script>', build_article(nil, :abstract => '<script>alert(1)</script>').lead
183 183 end
184 184  
  185 + should 'not add hard breaks for single line breaks' do
  186 + assert_equal "<p>one\nparagraph</p>", build_article("one\nparagraph").to_html
  187 + end
  188 +
185 189 protected
186 190  
187 191 def build_article(input = nil, options = {})
... ...