Merge pull request #952 from RawKStar77/threads2

Changed how threading works.

h/css/common.scss

@@ -771,9 +771,6 @@ blockquote {
     }
 
     & > .annotation {
-      .body {
-        font-size: .95em;
-      }
 
       .body * {
         overflow: hidden;
@@ -817,6 +814,47 @@ blockquote {
 }
 
 
+//COLLAPSED REPLIES////////////////////////////////
+.reply-count:hover {
+  color: $linkColorHover;
+  text-decoration: none;
+}
+
+.collapsedreply {
+  display: none;
+}
+
+.hidereplies {
+  display: block;
+  
+  li { 
+    display: none;
+
+    &.collapsedreplies {
+      display: none !important;
+    }
+  }
+}
+
+.collapsedreplies {
+    @extend .collapsed;
+    display: block !important;
+
+  .collapsedreply{
+      display: inline;
+      font-style: italic;
+      margin-right: 5px;
+      margin-left: 5px;
+  }
+  & > .annotation {
+    .body {
+      display: none;
+    }
+    .magicontrols {
+      display: none;
+    }
+  }
+}
 
 //MAGICONTROLS////////////////////////////////
 .magicontrols {

h/js/directives.coffee

@@ -225,6 +225,16 @@ thread = ->
       scope.collapsed = !scope.collapsed
       scope.openDetails scope.annotation unless scope.collapsed
 
+    scope.toggleReplies = (event) ->
+      event.stopPropagation()
+      scope.collapseReplies = !scope.collapseReplies
+      # console.log "Works."
+      if scope.collapseReplies
+        elem.addClass 'hidereplies'
+      else
+        elem.removeClass 'hidereplies'
+      unless scope.collapseReplies then scope.collapsed = false
+
     scope.$on 'toggleEditing', (event) ->
       {$id, editing} = event.targetScope
       if editing
@@ -237,7 +247,6 @@ thread = ->
         delete childrenEditing[$id]
   restrict: 'C'
 
-
 userPicker = ->
   restrict: 'ACE'
   scope: