Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
Cambios para hacer commit: modificado: .gitignore modificado: app/assets/javascripts/comments.js.coffee modificado: app/views/comments/_comment.html.erb modificado: spec/features/comments/debates_spec.rb
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -32,3 +32,6 @@
|
|||||||
|
|
||||||
public/sitemap.xml
|
public/sitemap.xml
|
||||||
public/system/
|
public/system/
|
||||||
|
|
||||||
|
#Netbeans projects files
|
||||||
|
/nbproject
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ App.Comments =
|
|||||||
this.update_comments_count()
|
this.update_comments_count()
|
||||||
|
|
||||||
add_reply: (parent_id, response_html) ->
|
add_reply: (parent_id, response_html) ->
|
||||||
|
if $("##{parent_id} .comment-children").length == 0
|
||||||
|
$("##{parent_id}").append("<li><ul id='#{parent_id}_children' class='no-bullet comment-children'></ul></li>")
|
||||||
$("##{parent_id} .comment-children:first").prepend($(response_html))
|
$("##{parent_id} .comment-children:first").prepend($(response_html))
|
||||||
this.update_comments_count()
|
this.update_comments_count()
|
||||||
|
|
||||||
|
|||||||
@@ -93,6 +93,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
|
<%unless child_comments_of(comment).empty?%>
|
||||||
<li>
|
<li>
|
||||||
<ul id="<%= dom_id(comment) %>_children" class="no-bullet comment-children">
|
<ul id="<%= dom_id(comment) %>_children" class="no-bullet comment-children">
|
||||||
<% child_comments_of(comment).each do |child| %>
|
<% child_comments_of(comment).each do |child| %>
|
||||||
@@ -102,5 +103,6 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
<%end%>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -33,6 +33,10 @@ feature 'Commenting debates' do
|
|||||||
expect(page).to have_content second_child.body
|
expect(page).to have_content second_child.body
|
||||||
|
|
||||||
expect(page).to have_link "Go back to #{debate.title}", href: debate_path(debate)
|
expect(page).to have_link "Go back to #{debate.title}", href: debate_path(debate)
|
||||||
|
|
||||||
|
expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2)
|
||||||
|
expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1)
|
||||||
|
expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Collapsable comments', :js do
|
scenario 'Collapsable comments', :js do
|
||||||
|
|||||||
Reference in New Issue
Block a user