From 3af5e246bec8df17264c88c85e9439c0390832ee Mon Sep 17 00:00:00 2001
From: Jessica McKellar <jesstess@humbughq.com>
Date: Tue, 6 Nov 2012 17:06:47 -0500
Subject: [PATCH] Don't cache your personal gravatar across gravatar updates.

(imported from commit 06f82faaa350db8a64cebef24b738b5e93bebb98)
---
 tools/jslint/check-all.js       | 2 +-
 zephyr/jstemplates/message.html | 2 +-
 zephyr/static/js/ui.js          | 4 +++-
 zephyr/static/js/zephyr.js      | 4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js
index 9306d19818..634fd615eb 100644
--- a/tools/jslint/check-all.js
+++ b/tools/jslint/check-all.js
@@ -42,7 +42,7 @@ var globals =
     // ui.js
     + ' register_onclick hide_email show_email'
     + ' report_error report_success report_message clicking mouse_moved'
-    + ' userinfo_currently_popped update_gravatars'
+    + ' userinfo_currently_popped update_gravatars gravatar_stamp'
     + ' register_user_info_mouseover register_user_info_mouseout'
 
     // zephyr.js
diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index fb23ca99b0..0e48c3c006 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -50,7 +50,7 @@
     <td class="message_picture">
     {{#include_sender}}
         <img class="img-rounded profile_picture user_info_hover"
-             src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"
+             src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30?stamp={{stamp}}"
              onclick="userinfo_popover(event, this, {{id}});"/>
     {{/include_sender}}
     </td>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 8f86181e80..e7a5824f08 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -3,6 +3,7 @@
 // scrollbar when we switch to a new tab (and restore it
 // when we switch back.)
 var scroll_positions = {};
+var gravatar_stamp = 1;
 
 function register_onclick(message_row, message_id) {
     message_row.find(".messagebox").click(function (e) {
@@ -461,8 +462,9 @@ $(function () {
 
 function update_gravatars() {
     $.each($(".gravatar-profile"), function(index, profile) {
-        $(this).attr('src', $(this).attr('src') + '?' + $.now());
+        $(this).attr('src', $(this).attr('src') + '?stamp=' + gravatar_stamp);
     });
+    gravatar_stamp += 1;
 }
 
 function poll_for_gravatar_update(start_time, url) {
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 668639bce0..77cc5bba70 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -325,6 +325,10 @@ function add_to_table(messages, table_name, filter_function, where) {
 
         message.dom_id = table_name + message.id;
 
+        if (message.sender_email === email) {
+            message.stamp = gravatar_stamp;
+        }
+
         messages_to_render.push(message);
         prev = message;
     });