paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 23:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

subscriptions: Simplify the displaying of subs pane.

Browse Source 
".stream-info-title" selector is used to hide both
"#add_new_stream_title" and "#stream_settings_title"
classes. This will be helpful when we add new html
elements to display in the title area..

`clear_edit_panel` can be removed as the next line to
where it is called makes it redundant, we only need
to de-select the stream row, as done in this commit.
This commit is contained in:
Ryan Rehman
2020-07-09 03:24:13 +05:30
committed by Tim Abbott
parent e0b5c2ec49
commit 806da412ac
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/stream_create.js
View File

@@ -235,14 +235,9 @@ function create_stream() {
exports.new_stream_clicked = function (stream_name) { exports.new_stream_clicked = function (stream_name) {
// this changes the tab switcher (settings/preview) which isn't necessary // this changes the tab switcher (settings/preview) which isn't necessary
// to a add new stream title. // to a add new stream title.
$(".display-type #add_new_stream_title").show(); subs.show_subs_pane.create_stream();
$(".display-type #stream_settings_title").hide();
$(".stream-row.active").removeClass("active"); $(".stream-row.active").removeClass("active");
$("#stream_settings_title, .subscriptions-container .settings, .nothing-selected").hide();
$("#stream-creation, #add_new_stream_title").show();
if (stream_name !== "") { if (stream_name !== "") {
$("#create_stream_name").val(stream_name); $("#create_stream_name").val(stream_name);
} }

10
static/js/stream_edit.js
View File

@@ -116,12 +116,6 @@ function set_stream_message_retention_setting_dropdown(stream) {
change_stream_message_retention_days_block_display_property(value); change_stream_message_retention_days_block_display_property(value);
} }
function clear_edit_panel() {
$(".display-type #add_new_stream_title").hide();
$(".display-type #stream_settings_title, .right .settings").show();
$(".stream-row.active").removeClass("active");
}
function get_stream_id(target) { function get_stream_id(target) {
if (target.constructor !== jQuery) { if (target.constructor !== jQuery) {
target = $(target); target = $(target);
@@ -148,7 +142,7 @@ function get_sub_for_target(target) {
exports.open_edit_panel_for_row = function (stream_row) { exports.open_edit_panel_for_row = function (stream_row) {
const sub = get_sub_for_target(stream_row); const sub = get_sub_for_target(stream_row);
clear_edit_panel(); $(".stream-row.active").removeClass("active");
subs.show_subs_pane.settings(); subs.show_subs_pane.settings();
$(stream_row).addClass("active"); $(stream_row).addClass("active");
setup_subscriptions_stream_hash(sub); setup_subscriptions_stream_hash(sub);
@@ -157,7 +151,7 @@ exports.open_edit_panel_for_row = function (stream_row) {
exports.open_edit_panel_empty = function () { exports.open_edit_panel_empty = function () {
const tab_key = $(subs.get_active_data().tabs[0]).attr("data-tab-key"); const tab_key = $(subs.get_active_data().tabs[0]).attr("data-tab-key");
clear_edit_panel(); $(".stream-row.active").removeClass("active");
subs.show_subs_pane.nothing_selected(); subs.show_subs_pane.nothing_selected();
exports.setup_subscriptions_tab_hash(tab_key); exports.setup_subscriptions_tab_hash(tab_key);
}; };

12
static/js/subs.js
View File

@@ -11,12 +11,16 @@ const util = require("./util");
exports.show_subs_pane = { exports.show_subs_pane = {
nothing_selected() { nothing_selected() {
$(".nothing-selected, #stream_settings_title").show(); $(".stream-info-title, .settings, #stream-creation").hide();
$("#add_new_stream_title, .settings, #stream-creation").hide(); $("#stream_settings_title, .nothing-selected").show();
}, },
settings() { settings() {
$(".settings, #stream_settings_title").show(); $(".stream-info-title, .settings, #stream-creation").hide();
$("#add_new_stream_title, #stream-creation, .nothing-selected").hide(); $("#stream_settings_title, .settings").show();
},
create_stream() {
$(".stream-info-title, .nothing-selected, .settings, #stream-creation").hide();
$("#add_new_stream_title, #stream-creation").show();
}, },
}; };