From 12013cd7b72a97fc66995a3674db680c33cda02a Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 21 Sep 2012 16:43:52 -0400 Subject: [PATCH] Fix collapsing of huddle messages. (imported from commit 31391a278f5fe70ab56379bf7cc3fad2d0663007) --- zephyr/static/js/zephyr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js index ec93e72c92..54fa2154b1 100644 --- a/zephyr/static/js/zephyr.js +++ b/zephyr/static/js/zephyr.js @@ -665,7 +665,7 @@ function add_to_tables(zephyr, parent, table_name) { if (parent !== undefined && zephyr.type === parent.type && ( - (zephyr.is_huddle) && (parent.name === zephyr.name) || + (zephyr.is_huddle) && (get_huddle_recipient(parent) === get_huddle_recipient(zephyr)) || (zephyr.is_personal) && (parent.reply_to === zephyr.reply_to) || ((zephyr.is_class) && (parent.display_recipient === zephyr.display_recipient) && (parent.instance === zephyr.instance))