From f66124cbe2c469a74b5b3a75e85a3f4b96666b42 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Tue, 9 Oct 2012 17:51:45 -0400
Subject: [PATCH] Rename select_zephyr(_by_id) to select_message_*.

(imported from commit 91619adf0e610017fbef52d2796020cb16537653)
---
 tools/jslint/check-all.js      |  2 +-
 zephyr/jstemplates/zephyr.html |  8 ++++----
 zephyr/static/js/hotkey.js     |  6 +++---
 zephyr/static/js/ui.js         |  2 +-
 zephyr/static/js/zephyr.js     | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js
index 81cd2d5cd6..b9566b88ef 100644
--- a/tools/jslint/check-all.js
+++ b/tools/jslint/check-all.js
@@ -40,7 +40,7 @@ var globals =
     + ' message_array message_dict'
     + ' status_classes clear_table add_to_table instance_list'
     + ' keep_pointer_in_view respond_to_zephyr'
-    + ' select_zephyr select_zephyr_by_id'
+    + ' select_message select_message_by_id'
     + ' scroll_to_selected select_and_show_by_id'
     + ' selected_zephyr selected_zephyr_id'
     + ' at_top_of_viewport at_bottom_of_viewport'
diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index b70542a9a9..9d665c4c17 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -23,23 +23,23 @@
 <tr class="recipient_row">
     <td colspan="2"
         class="message_label_clickable zephyr_newstyle_class"
-        onclick="select_zephyr_by_id({{id}}); narrow_class();"
+        onclick="select_message_by_id({{id}}); narrow_class();"
         title="{{display_recipient}}">{{display_recipient}}</td>
     <td class="message_label_clickable zephyr_newstyle_instance"
-        onclick="select_zephyr_by_id({{id}}); narrow_instance();"
+        onclick="select_message_by_id({{id}}); narrow_instance();"
         title="{{instance}}">{{instance}}</td>
 </tr>
 {{else}}
 <tr class="recipient_row">
     <td colspan="3" class="message_label_clickable zephyr_newstyle_pm"
-        onclick="select_zephyr_by_id({{id}}); narrow_by_recipient();"
+        onclick="select_message_by_id({{id}}); narrow_by_recipient();"
         title="Huddle with {{display_reply_to}}">Huddle with {{display_reply_to}}</td>
 </tr>
 {{/if}}
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}"
     class="zephyr_row{{^is_class}} personal-message{{/is_class}}"
-    onclick="select_zephyr_by_id({{id}});">
+    onclick="select_message_by_id({{id}});">
     <td class="zephyr_picture">
     {{#include_sender}}
         <img class="img-rounded profile_picture"
diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js
index 4856464d4f..b2080a5e7d 100644
--- a/zephyr/static/js/hotkey.js
+++ b/zephyr/static/js/hotkey.js
@@ -38,7 +38,7 @@ function process_hotkey(code) {
     if (directional_hotkeys.hasOwnProperty(code)) {
         next_message = directional_hotkeys[code](selected_zephyr);
         if (next_message.length !== 0) {
-            select_zephyr(next_message, true);
+            select_message(next_message, true);
         }
         if ((next_message.length === 0) && (code === 40 || code === 106)) {
             // At the last zephyr, scroll to the bottom so we have
@@ -65,13 +65,13 @@ function process_hotkey(code) {
     case 33: // Page Up
         keep_pointer_in_view();
         if (at_top_of_viewport()) {
-            select_zephyr(get_first_visible(), false);
+            select_message(get_first_visible(), false);
         }
         return false; // We want the browser to actually page up and down
     case 34: // Page Down
         keep_pointer_in_view();
         if (at_bottom_of_viewport()) {
-            select_zephyr(get_last_visible(), false);
+            select_message(get_last_visible(), false);
         }
         return false;
     case 27: // Esc: hide compose pane
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 1d40dba735..fc7b14e62a 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -8,7 +8,7 @@ function register_onclick(zephyr_row, zephyr_id) {
     zephyr_row.find(".messagebox").click(function (e) {
         if (!(clicking && mouse_moved)) {
             // Was a click (not a click-and-drag).
-            select_zephyr_by_id(zephyr_id);
+            select_message_by_id(zephyr_id);
             respond_to_zephyr();
         }
         mouse_moved = false;
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 4f024e8596..14a2d9993d 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -142,18 +142,18 @@ function respond_to_zephyr(reply_type) {
 }
 
 // Called by mouseover etc.
-function select_zephyr_by_id(zephyr_id) {
+function select_message_by_id(zephyr_id) {
     if (zephyr_id === selected_zephyr_id) {
         return;
     }
-    select_zephyr(get_zephyr_row(zephyr_id), false);
+    select_message(get_zephyr_row(zephyr_id), false);
 }
 
 // Called on page load and when we [un]narrow.
-// Forces a call to select_zephyr even if the id has not changed,
+// Forces a call to select_message even if the id has not changed,
 // because the visible table might have.
 function select_and_show_by_id(zephyr_id) {
-    select_zephyr(get_zephyr_row(zephyr_id), true);
+    select_message(get_zephyr_row(zephyr_id), true);
 }
 
 function update_selected_zephyr(zephyr) {
@@ -172,7 +172,7 @@ function update_selected_zephyr(zephyr) {
     selected_zephyr = zephyr;
 }
 
-function select_zephyr(next_message, scroll_to) {
+function select_message(next_message, scroll_to) {
     var viewport = $(window);
 
     /* If the zephyr exists but is hidden, try to find the next visible one. */