merge with master

2016-12-12 16:09:05 +01:00
parent fac652f377 21ca828f81
commit 2e8650c324
43 changed files with 381 additions and 254 deletions
--- a/app/assets/javascripts/comments.js.coffee
+++ b/app/assets/javascripts/comments.js.coffee
@@ -52,5 +52,6 @@ App.Comments =
        children_container_id = "#{$(this).data().id}_children"
        $("##{children_container_id}").toggle('slow')
        App.Comments.toggle_arrow(children_container_id)
+        $(this).children('.js-child-toggle').toggle()
        false
      )