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

Convert more stream_ids to ints. 

This fixes some regressions from a recent
commit that might not have been deployed.

9f7be51ce8

Even if that change had been deployed, it
should not have been user-facing, but it
would have spammed us with blueslip errors
every time somebody used the stream/topic
popovers in the left sidebar.
This commit is contained in:
Steve Howell 2020-01-12 12:39:37 +00:00 committed by Tim Abbott
parent eba22e8e25
commit 38ac8e9f3e
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/stream_color.js
View File

@ -76,7 +76,7 @@ exports.update_stream_color = function (sub, color, opts) {
}; };
function picker_do_change_color(color) { function picker_do_change_color(color) {
const stream_id = $(this).attr('stream_id'); const stream_id = parseInt($(this).attr('stream_id'), 10);
const hex_color = color.toHexString(); const hex_color = color.toHexString();
subs.set_color(stream_id, hex_color); subs.set_color(stream_id, hex_color);
} }

31
static/js/stream_popover.js
View File

@ -12,6 +12,20 @@ let current_topic_sidebar_elem;
let all_messages_sidebar_elem; let all_messages_sidebar_elem;
let starred_messages_sidebar_elem; let starred_messages_sidebar_elem;
function elem_to_stream_id(elem) {
const stream_id = parseInt(elem.attr('data-stream-id'), 10);
if (stream_id === undefined) {
blueslip.error('could not find stream id');
}
return stream_id;
}
function topic_popover_stream_id(e) {
return elem_to_stream_id($(e.currentTarget));
}
exports.stream_popped = function () { exports.stream_popped = function () {
return current_stream_sidebar_elem !== undefined; return current_stream_sidebar_elem !== undefined;
}; };
@ -70,7 +84,8 @@ exports.hide_streamlist_sidebar = function () {
function stream_popover_sub(e) { function stream_popover_sub(e) {
const stream_id = $(e.currentTarget).parents('ul').attr('data-stream-id'); const elem = $(e.currentTarget).parents('ul');
const stream_id = elem_to_stream_id(elem);
const sub = stream_data.get_sub_by_id(stream_id); const sub = stream_data.get_sub_by_id(stream_id);
if (!sub) { if (!sub) {
blueslip.error('Unknown stream: ' + stream_id); blueslip.error('Unknown stream: ' + stream_id);
@ -252,7 +267,8 @@ exports.register_click_handlers = function () {
e.stopPropagation(); e.stopPropagation();
const elt = e.target; const elt = e.target;
const stream_id = $(elt).parents('li').attr('data-stream-id'); const stream_li = $(elt).parents('li');
const stream_id = elem_to_stream_id(stream_li);
build_stream_popover({ build_stream_popover({
elt: elt, elt: elt,
@ -264,7 +280,8 @@ exports.register_click_handlers = function () {
e.stopPropagation(); e.stopPropagation();
const elt = $(e.target).closest('.topic-sidebar-arrow').expectOne()[0]; const elt = $(e.target).closest('.topic-sidebar-arrow').expectOne()[0];
const stream_id = $(elt).closest('.narrow-filter').expectOne().attr('data-stream-id'); const stream_li = $(elt).closest('.narrow-filter').expectOne();
const stream_id = elem_to_stream_id(stream_li);
const topic_name = $(elt).closest('li').expectOne().attr('data-topic-name'); const topic_name = $(elt).closest('li').expectOne().attr('data-topic-name');
build_topic_popover({ build_topic_popover({
@ -384,15 +401,7 @@ exports.register_stream_handlers = function () {
}; };
function topic_popover_stream_id(e) {
// TODO: use data-stream-id in stream list
const stream_id = $(e.currentTarget).attr('data-stream-id');
return stream_id;
}
function topic_popover_sub(e) { function topic_popover_sub(e) {
// TODO: use data-stream-id in stream list
const stream_id = topic_popover_stream_id(e); const stream_id = topic_popover_stream_id(e);
if (!stream_id) { if (!stream_id) {
blueslip.error('cannot find stream id'); blueslip.error('cannot find stream id');