From a00227c864e3290e8ad7ac30787eb9a04c309b15 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Thu, 20 Sep 2012 13:43:20 -0400
Subject: [PATCH] Implicitly choose the selected zephyr for showing email
 address

I erroneously switched halfway in ce4f6289491722d4c1aa84fe8b88b3a5932a3f2a, so
let's just do it for real.

(imported from commit 4c09a7805f6e2322cbbab2f8534e9d362acdc826)
---
 zephyr/jstemplates/zephyr.html | 2 +-
 zephyr/static/js/zephyr.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index de5a5b4373..e62ec977a8 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -30,7 +30,7 @@
     <td class="messagebox{{^include_sender}} collapsed_child{{/include_sender}}" onclick="select_zephyr_by_id({{id}}); respond_to_zephyr();">
     {{#include_sender}}
         <img class="profile_picture" src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"/>
-        <span class="zephyr_label_clickable zephyr_sender" onmouseover="show_email({{id}});" onmouseout="hide_email();">
+        <span class="zephyr_label_clickable zephyr_sender" onmouseover="select_zephyr_by_id({{id}}); show_email();" onmouseout="hide_email();">
             <span class="zephyr_sender_name">{{sender_name}}</span> <span class="zephyr_sender_email invisible">{{sender_email}}</span>
             <span class="zephyr_sender_username">{{sender}}</span>
         </span>
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 446405482c..38d3247ec4 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -357,7 +357,7 @@ function hide_email() {
     $('.zephyr_sender_email').addClass('invisible');
 }
 
-function show_email(zephyr_id) {
+function show_email() {
     hide_email();
     selected_zephyr.find('.zephyr_sender_email').removeClass('invisible');
 }