Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Keegan McAllister 2012-09-20 13:43:20 -04:00
parent 8d994bdb21
commit a00227c864
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zephyr/jstemplates/zephyr.html
View File

@ -30,7 +30,7 @@
<td class="messagebox{{^include_sender}} collapsed_child{{/include_sender}}" onclick="select_zephyr_by_id({{id}}); respond_to_zephyr();"> <td class="messagebox{{^include_sender}} collapsed_child{{/include_sender}}" onclick="select_zephyr_by_id({{id}}); respond_to_zephyr();">
{{#include_sender}} {{#include_sender}}
<img class="profile_picture" src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"/> <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_name">{{sender_name}}</span> <span class="zephyr_sender_email invisible">{{sender_email}}</span>
<span class="zephyr_sender_username">{{sender}}</span> <span class="zephyr_sender_username">{{sender}}</span>
</span> </span>

2
zephyr/static/js/zephyr.js
View File

@ -357,7 +357,7 @@ function hide_email() {
$('.zephyr_sender_email').addClass('invisible'); $('.zephyr_sender_email').addClass('invisible');
} }
function show_email(zephyr_id) { function show_email() {
hide_email(); hide_email();
selected_zephyr.find('.zephyr_sender_email').removeClass('invisible'); selected_zephyr.find('.zephyr_sender_email').removeClass('invisible');
} }