From 93b2e363851bbb51936465c68e43c4b591f1284d Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 20 Jul 2015 15:31:18 +0800
Subject: Bug 1185440 - activity bound to comments which are default-hidden is
 not hidden by default

---
 .../template/en/default/bug_modal/activity_stream.html.tmpl   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'extensions/BugModal')

diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
index b752a47fe..2e81f1aba 100644
--- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -225,11 +225,16 @@
 
 [%
   BLOCK activity_body;
+    classes = "activity";
+    style = "";
     IF activity.cc_only && !change_set.cc_only;
-      '<div class="activity cc-only" style="display:none">';
-    ELSE;
-      '<div class="activity">';
+      classes = classes _ " cc-only";
+      style = ' style="display:none"';
+    END;
+    IF change_set.comment && change_set.comment.collapsed;
+      style = ' style="display:none"';
     END;
+    '<div class="' _ classes _ '"' _ style _ '>';
 
     FOREACH change IN activity.changes;
       IF change.fieldname == 'cc' && !activity.cc_only && !change_set.cc_only;
-- 
cgit v1.2.3-24-g4f1b