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

refactor: Introduce other_stream_ids in filter_table(). 

We now build up three buckets of stream ids for slightly
more consistent code that will help in future refactorings.
This commit is contained in:
Steve Howell 2018-07-29 12:55:29 +00:00 committed by Tim Abbott
parent 32438cde9f
commit 5641c77c94
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/subs.js
View File

@ -85,13 +85,7 @@ run_test('filter_table', () => {
var sub_table = $('#subscriptions_table .streams-list');
var sub_table_append = [];
sub_table.append = function (rows) {
if (typeof rows === "string") {
sub_table_append.push(rows);
} else {
_.each(rows, function (row) {
sub_table_append.push(row);
});
}
sub_table_append.push(rows);
};
var ui_called = false;

29
static/js/subs.js
View File

@ -357,7 +357,7 @@ exports.filter_table = function (query) {
var stream_name_match_stream_ids = [];
var stream_description_match_stream_ids = [];
var others = [];
var other_stream_ids = [];
var stream_id_to_stream_name = {};
var widgets = {};
var streams_list_scrolltop = $(".streams-list").scrollTop();
@ -374,23 +374,18 @@ exports.filter_table = function (query) {
if (stream_matches_query(query, sub, 'name')) {
$(row).removeClass("notdisplayed");
stream_id_to_stream_name[sub.stream_id] = sub.name;
stream_name_match_stream_ids.push(sub.stream_id);
widgets[sub.stream_id] = $(row).detach();
} else if (stream_matches_query(query, sub, 'description')) {
$(row).removeClass("notdisplayed");
stream_id_to_stream_name[sub.stream_id] = sub.name;
stream_description_match_stream_ids.push(sub.stream_id);
widgets[sub.stream_id] = $(row).detach();
} else {
$(row).addClass("notdisplayed");
others.push($(row).detach());
other_stream_ids.push(sub.stream_id);
}
stream_id_to_stream_name[sub.stream_id] = sub.name;
widgets[sub.stream_id] = $(row).detach();
$(row).find('.sub-info-box [class$="-bar"] [class$="-count"]').tooltip({
placement: 'left', animation: false,
});
@ -401,16 +396,16 @@ exports.filter_table = function (query) {
stream_name_match_stream_ids.sort(sort_by_stream_name);
stream_description_match_stream_ids.sort(sort_by_stream_name);
_.each(stream_name_match_stream_ids, function (stream_id) {
var all_stream_ids = [].concat(
stream_name_match_stream_ids,
stream_description_match_stream_ids,
other_stream_ids
);
_.each(all_stream_ids, function (stream_id) {
$('#subscriptions_table .streams-list').append(widgets[stream_id]);
});
_.each(stream_description_match_stream_ids, function (stream_id) {
$('#subscriptions_table .streams-list').append(widgets[stream_id]);
});
$('#subscriptions_table .streams-list').append(others);
if ($(".stream-row.active").hasClass("notdisplayed")) {
$(".right .settings").hide();
$(".nothing-selected").show();