Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

subs: Clean up ancient collapsing logic.

This commit is contained in:
Tim Abbott 2017-03-21 22:58:54 -07:00
parent bfc67f6602
commit 1ad0d35966
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
static/js/subs.js
View File

@ -375,8 +375,7 @@ exports.update_settings_for_subscribed = function (sub) {
// Display the swatch and subscription stream_settings // Display the swatch and subscription stream_settings
var sub_row = stream_settings.closest('.stream-row'); var sub_row = stream_settings.closest('.stream-row');
sub_row.find(".color_swatch").addClass('in'); sub_row.find(".regular_subscription_settings").addClass('in');
sub_row.find(".regular_subscription_settings").collapse('show');
}; };
exports.update_settings_for_unsubscribed = function (sub) { exports.update_settings_for_unsubscribed = function (sub) {
@ -395,14 +394,7 @@ exports.update_settings_for_unsubscribed = function (sub) {
// Hide the swatch and subscription settings // Hide the swatch and subscription settings
var sub_row = stream_settings.closest('.stream-row'); var sub_row = stream_settings.closest('.stream-row');
sub_row.find(".color_swatch").removeClass('in'); sub_row.find(".regular_subscription_settings").removeClass('in');
if (sub.render_subscribers) {
// TODO: having a completely empty settings div messes
// with Bootstrap's collapser. We currently just ensure
// that it's not empty for Zephyr mirror realms, even though it
// looks weird
sub_row.find(".regular_subscription_settings").collapse('hide');
}
row_for_stream_id(subs.stream_id).attr("data-temp-view", true); row_for_stream_id(subs.stream_id).attr("data-temp-view", true);
}; };
@ -1390,13 +1382,6 @@ $(function () {
$("#stream_privacy_modal").remove(); $("#stream_privacy_modal").remove();
}); });
$("#subscriptions_table").on("show", ".regular_subscription_settings", function (e) {
// We want 'show' events that originate from
// 'regular_subscription_settings' divs not to trigger the
// handler for the entire subscription_settings div
e.stopPropagation();
});
$("#subscriptions_table").on("hide", ".subscription_settings", function (e) { $("#subscriptions_table").on("hide", ".subscription_settings", function (e) {
var sub_arrow = $(e.target).closest('.stream-row').find('.sub_arrow i'); var sub_arrow = $(e.target).closest('.stream-row').find('.sub_arrow i');
sub_arrow.removeClass('icon-vector-chevron-up'); sub_arrow.removeClass('icon-vector-chevron-up');