Download as
Browse Code »

Commit 3c1eb907d0bf58b5197f7bae6f7c3a940ceb8ef9

Authored by Victor Costa
2 parents 23e94684 338114ff
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'AI3205-comment-paragraph' into stable

Showing 2 changed files with 10 additions and 2 deletions   Show diff stats
plugins/comment_paragraph/lib/ext/article.rb
  Diff comments   View file @3c1eb90
@@ -24,14 +24,14 @@ class Article @@ -24,14 +24,14 @@ class Article
24 if body && (body_changed? || setting_changed?(:comment_paragraph_plugin_activate)) 24 if body && (body_changed? || setting_changed?(:comment_paragraph_plugin_activate))
25 updated = body_changed? ? body_change[1] : body 25 updated = body_changed? ? body_change[1] : body
26 doc = Nokogiri::HTML(updated) 26 doc = Nokogiri::HTML(updated)
27 - doc.css('body > div, body > span, body > p, li').each do |paragraph| 27 + doc.css('li, body > div, body > span, body > p').each do |paragraph|
28 next if paragraph.css('[data-macro="comment_paragraph_plugin/allow_comment"]').present? || paragraph.content.blank? 28 next if paragraph.css('[data-macro="comment_paragraph_plugin/allow_comment"]').present? || paragraph.content.blank?
29 29
30 commentable = Nokogiri::XML::Node.new("span", doc) 30 commentable = Nokogiri::XML::Node.new("span", doc)
31 commentable['class'] = "macro article_comments paragraph_comment #{paragraph['class']}" 31 commentable['class'] = "macro article_comments paragraph_comment #{paragraph['class']}"
32 commentable['data-macro'] = 'comment_paragraph_plugin/allow_comment' 32 commentable['data-macro'] = 'comment_paragraph_plugin/allow_comment'
33 commentable['data-macro-paragraph_uuid'] = SecureRandom.uuid 33 commentable['data-macro-paragraph_uuid'] = SecureRandom.uuid
34 - commentable.inner_html = paragraph.content 34 + commentable.inner_html = paragraph.inner_html
35 paragraph.inner_html = commentable 35 paragraph.inner_html = commentable
36 end 36 end
37 self.body = doc.at('body').inner_html 37 self.body = doc.at('body').inner_html
plugins/comment_paragraph/test/unit/article_test.rb
  Diff comments   View file @3c1eb90
@@ -49,6 +49,14 @@ class ArticleTest < ActiveSupport::TestCase @@ -49,6 +49,14 @@ class ArticleTest < ActiveSupport::TestCase
49 assert_mark_paragraph article.body, 'li', 'item2' 49 assert_mark_paragraph article.body, 'li', 'item2'
50 end 50 end
51 51
  52 + should 'parse inner html li when activate comment paragraph' do
  53 + article.body = '<div><ul><li class="custom_class">item1</li><li>item2</li></ul><div>'
  54 + article.comment_paragraph_plugin_activate = true
  55 + article.save!
  56 + assert_mark_paragraph article.body, 'li', 'item1'
  57 + assert_mark_paragraph article.body, 'li', 'item2'
  58 + end
  59 +
52 should 'do not remove macro div when disable comment paragraph' do 60 should 'do not remove macro div when disable comment paragraph' do
53 article.body = "<p>paragraph 1</p>" 61 article.body = "<p>paragraph 1</p>"
54 article.comment_paragraph_plugin_activate = true 62 article.comment_paragraph_plugin_activate = true