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

refactor: Add early return to subs.mark_subscribed().

Browse Source 
The code now handles the `sub.subscribed` condition up front to
make the code less nested.
This commit is contained in:
Steve Howell
2017-01-20 13:03:52 -08:00
committed by Tim Abbott
parent 0ccb2e38f8
commit f476f5be7d
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
static/js/subs.js
View File

@@ -385,40 +385,39 @@ exports.mark_subscribed = function (stream_name, attrs) {
return;
}
if (! sub.subscribed) {
// Add yourself to a stream we already know about client-side.
var color = get_color();
exports.set_color(sub.stream_id, color);
sub.subscribed = true;
if (attrs) {
stream_data.set_subscriber_emails(sub, attrs.subscribers);
}
var settings = settings_for_sub(sub);
var button = button_for_sub(sub);
if (button.length !== 0) {
exports.rerender_subscribers_count(sub);
button.toggleClass("checked");
// Add the user to the member list if they're currently
// viewing the members of this stream
if (sub.render_subscribers && settings.hasClass('in')) {
prepend_subscriber(settings,
page_params.email);
}
} else {
add_sub_to_table(sub);
}
// Display the swatch and subscription settings
var sub_row = settings.closest('.stream-row');
sub_row.find(".color_swatch").addClass('in');
sub_row.find(".regular_subscription_settings").collapse('show');
} else {
// Already subscribed
if (sub.subscribed) {
return;
}
// Add yourself to a stream we already know about client-side.
var color = get_color();
exports.set_color(sub.stream_id, color);
sub.subscribed = true;
if (attrs) {
stream_data.set_subscriber_emails(sub, attrs.subscribers);
}
var settings = settings_for_sub(sub);
var button = button_for_sub(sub);
if (button.length !== 0) {
exports.rerender_subscribers_count(sub);
button.toggleClass("checked");
// Add the user to the member list if they're currently
// viewing the members of this stream
if (sub.render_subscribers && settings.hasClass('in')) {
prepend_subscriber(settings,
page_params.email);
}
} else {
add_sub_to_table(sub);
}
// Display the swatch and subscription settings
var sub_row = settings.closest('.stream-row');
sub_row.find(".color_swatch").addClass('in');
sub_row.find(".regular_subscription_settings").collapse('show');
if (current_msg_list.narrowed) {
current_msg_list.update_trailing_bookend();
}