From 472f049cae21043ae1451b4992bfb331857025e7 Mon Sep 17 00:00:00 2001
From: Steve Howell <showell30@yahoo.com>
Date: Sun, 30 Oct 2016 06:49:43 -0700
Subject: [PATCH] Alphabetize subscription event cases in server_events.js.

I also split up peer_add and peer_remove into their own cases,
since they do opposite things and didn't share that much code
in common.
---
 static/js/server_events.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/static/js/server_events.js b/static/js/server_events.js
index 78d35f24f2..d92e7b24a6 100644
--- a/static/js/server_events.js
+++ b/static/js/server_events.js
@@ -121,6 +121,20 @@ function dispatch_normal_event(event) {
             _.each(event.subscriptions, function (sub) {
                 subs.mark_subscribed(sub.name, sub);
             });
+        } else if (event.op === 'peer_add') {
+            _.each(event.subscriptions, function (sub) {
+                var email = event.user_email;
+                stream_data.add_subscriber(sub, email);
+                $(document).trigger('peer_subscribe.zulip',
+                                    {stream_name: sub, user_email: email});
+            });
+        } else if (event.op === 'peer_remove') {
+            _.each(event.subscriptions, function (sub) {
+                var email = event.user_email;
+                stream_data.remove_subscriber(sub, email);
+                $(document).trigger('peer_unsubscribe.zulip',
+                                    {stream_name: sub, user_email: email});
+            });
         } else if (event.op === 'remove') {
             _.each(event.subscriptions, function (rec) {
                 var sub = stream_data.get_sub_by_id(rec.stream_id);
@@ -128,23 +142,6 @@ function dispatch_normal_event(event) {
             });
         } else if (event.op === 'update') {
             subs.update_subscription_properties(event.name, event.property, event.value);
-        } else if (event.op === 'peer_add' || event.op === 'peer_remove') {
-            _.each(event.subscriptions, function (sub) {
-                var js_event_type;
-                if (event.op === 'peer_add') {
-                    js_event_type = 'peer_subscribe.zulip';
-
-                    stream_data.add_subscriber(sub, event.user_email);
-                } else if (event.op === 'peer_remove') {
-                    js_event_type = 'peer_unsubscribe.zulip';
-
-                    stream_data.remove_subscriber(sub, event.user_email);
-                }
-
-                $(document).trigger(js_event_type, {stream_name: sub,
-                                                    user_email: event.user_email});
-            });
-
         }
         break;