From 0bf78df2f631df9dc0bdb3884f6fecb14e08d3a3 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Mon, 15 Oct 2012 13:00:31 -0400 Subject: [PATCH] Display full names in narrow description for huddles (imported from commit 665df20d129df4d7e516f145f064b90c6e0f34af) --- zephyr/static/js/narrow.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/zephyr/static/js/narrow.js b/zephyr/static/js/narrow.js index 3a88557057..c13b00c5f4 100644 --- a/zephyr/static/js/narrow.js +++ b/zephyr/static/js/narrow.js @@ -36,7 +36,7 @@ function target_message_for_narrow(id) { function narrow_huddle() { var original = message_dict[narrow_target_message_id]; - do_narrow("Huddles with " + original.reply_to, function (other) { + do_narrow("Huddles with " + original.display_reply_to, function (other) { return other.reply_to === original.reply_to; }); } @@ -50,14 +50,8 @@ function narrow_all_personals() { function narrow_personals() { // Narrow to personals with a specific user var original = message_dict[narrow_target_message_id]; - var other_party; - if (original.display_recipient.email === email) { - other_party = original.sender_email; - } else { - other_party = original.display_recipient.email; - } - do_narrow("Huddles with " + other_party, function (other) { + do_narrow("Huddles with " + original.display_replay_to, function (other) { return (other.type === 'personal') && (((other.display_recipient.email === original.display_recipient.email) && (other.sender_email === original.sender_email)) || ((other.display_recipient.email === original.sender_email) && (other.sender_email === original.display_recipient.email)));