From 6dd049fa2685fa95b2407954cc9681b2dfb846e3 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Mon, 29 Jul 2013 16:48:16 -0400
Subject: [PATCH] Rename zephyr.js to zulip.js.

(imported from commit e62aa374f1bf2e75cebc00d0bba4e3ade82d19f6)
---
 humbug/settings.py                | 2 +-
 static/js/compose.js              | 2 +-
 static/js/{zephyr.js => zulip.js} | 0
 tools/jslint/check-all.js         | 2 +-
 zephyr/tornado_callbacks.py       | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename static/js/{zephyr.js => zulip.js} (100%)

diff --git a/humbug/settings.py b/humbug/settings.py
index 2e623086aa..596911e877 100644
--- a/humbug/settings.py
+++ b/humbug/settings.py
@@ -388,7 +388,7 @@ JS_SPECS = {
             'js/invite.js',
             'js/message_list.js',
             'js/onboarding.js',
-            'js/zephyr.js',
+            'js/zulip.js',
             'js/activity.js',
             'js/colorspace.js',
             'js/timerender.js',
diff --git a/static/js/compose.js b/static/js/compose.js
index de1523dae2..2f82901395 100644
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -174,7 +174,7 @@ function update_fade () {
         focused_recipient.subject = $('#subject').val();
     } else {
         // Normalize the recipient list so it matches the one used when
-        // adding the message (see add_message_metadata(), zephyr.js).
+        // adding the message (see add_message_metadata(), zulip.js).
         focused_recipient.reply_to = util.normalize_recipients(
                 $('#private_message_recipient').val());
     }
diff --git a/static/js/zephyr.js b/static/js/zulip.js
similarity index 100%
rename from static/js/zephyr.js
rename to static/js/zulip.js
diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js
index e4bf90372d..680cae299c 100644
--- a/tools/jslint/check-all.js
+++ b/tools/jslint/check-all.js
@@ -36,7 +36,7 @@ var globals =
     // templates.js
     + ' templates'
 
-    // zephyr.js
+    // zulip.js
     + ' all_msg_list home_msg_list narrowed_msg_list current_msg_list get_updates_params'
     + ' add_messages'
     + ' subject_dict people_dict'
diff --git a/zephyr/tornado_callbacks.py b/zephyr/tornado_callbacks.py
index 3962e43297..1550f52a88 100644
--- a/zephyr/tornado_callbacks.py
+++ b/zephyr/tornado_callbacks.py
@@ -190,7 +190,7 @@ def fetch_table_messages(table, key, last):
         # The user's client has a way-too-old value for 'last'
         # (presumably 400 messages old), we should return an error
 
-        # The error handler for get_updates in zephyr.js parses this
+        # The error handler for get_updates in zulip.js parses this
         # message. If you change this message, you must update that
         # error handler.
         raise JsonableError("last value of %d too old!  Minimum valid is %d!" %