paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alphabetize subscription event cases in server_events.js.

Browse Source 
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.
This commit is contained in:
Steve Howell
2016-10-30 06:49:43 -07:00
committed by Tim Abbott
parent c3f2740481
commit 472f049cae
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
static/js/server_events.js
View File

@@ -121,6 +121,20 @@ function dispatch_normal_event(event) {
_.each(event.subscriptions, function (sub) { _.each(event.subscriptions, function (sub) {
subs.mark_subscribed(sub.name, 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') { } else if (event.op === 'remove') {
_.each(event.subscriptions, function (rec) { _.each(event.subscriptions, function (rec) {
var sub = stream_data.get_sub_by_id(rec.stream_id); 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') { } else if (event.op === 'update') {
subs.update_subscription_properties(event.name, event.property, event.value); 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; break;