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

Have stream_list.get_stream_li() use stream_sidebar.get_row(). 

Given a stream id, we now find list items using the internal
data structures we created when we built the sidebar, rather than
using a jQuery selector.
This commit is contained in:
Steve Howell 2017-06-02 16:13:57 -06:00 committed by Tim Abbott
parent d9b8da2483
commit 24d443a061
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
static/js/stream_list.js
View File

@ -137,7 +137,24 @@ function get_filter_li(type, name) {
}
exports.get_stream_li = function (stream_id) {
return $("#stream_sidebar_" + stream_id);
var row = exports.stream_sidebar.get_row(stream_id);
if (!row) {
blueslip.error('Cannot find stream for id ' + stream_id);
return;
}
var li = row.get_li();
if (!li) {
blueslip.error('Cannot find li for id ' + stream_id);
return;
}
if (li.length > 1) {
blueslip.error('stream_li has too many elements for ' + stream_id);
return;
}
return li;
};
function zoom_in() {
@ -191,6 +208,11 @@ function reset_to_unnarrowed(narrowed_within_same_stream) {
exports.set_in_home_view = function (stream_id, in_home) {
var li = exports.get_stream_li(stream_id);
if (!li) {
blueslip.error('passed in bad stream id ' + stream_id);
return;
}
if (in_home) {
li.removeClass("out_of_home_view");
} else {
@ -256,6 +278,11 @@ exports.create_sidebar_row = function (sub) {
exports.redraw_stream_privacy = function (stream_name) {
var sub = stream_data.get_sub(stream_name);
var li = exports.get_stream_li(sub.stream_id);
if (!li) {
blueslip.error('passed in bad stream: ' + stream_name);
return;
}
var div = li.find('.stream-privacy');
var color = stream_data.get_color(stream_name);
var dark_background = stream_color.get_color_class(color);
@ -276,6 +303,10 @@ function set_count(type, name, count) {
function set_stream_unread_count(stream_id, count) {
var unread_count_elem = exports.get_stream_li(stream_id);
if (!unread_count_elem) {
blueslip.error('passed in bad stream id ' + stream_id);
return;
}
update_count_in_dom(unread_count_elem, count);
}
@ -347,6 +378,10 @@ exports.refresh_pinned_or_unpinned_stream = function (sub) {
// our sight.
if (sub.pin_to_top) {
var stream_li = exports.get_stream_li(sub.stream_id);
if (!stream_li) {
blueslip.error('passed in bad stream id ' + sub.stream_id);
return;
}
exports.scroll_to_active_stream(stream_li);
}
};
@ -360,7 +395,7 @@ exports.maybe_activate_stream_item = function (filter) {
if (stream_id && stream_data.id_is_subscribed(stream_id)) {
var stream_li = exports.get_stream_li(stream_id);
if (stream_li.length !== 1) {
if (!stream_li) {
// It should be the case then when we have a subscribed
// stream, there will always be a stream list item
// corresponding to that stream in our sidebar. We have