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

narrow_state: Rename pm_string to current_filter_pm_string. 

It would conflict with the pm_string() function after migration to an
ES6 module.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-09-22 17:29:31 -07:00 committed by Tim Abbott
parent b9acc5ee9a
commit cb68964926
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/narrow_state.js
View File

@ -225,7 +225,7 @@ exports._possible_unread_message_ids = function () {
let stream_id; let stream_id;
let topic_name; let topic_name;
let pm_string; let current_filter_pm_string;
if (current_filter.can_bucket_by("stream", "topic")) { if (current_filter.can_bucket_by("stream", "topic")) {
stream_id = exports.stream_id(); stream_id = exports.stream_id();
@ -245,11 +245,11 @@ exports._possible_unread_message_ids = function () {
} }
if (current_filter.can_bucket_by("pm-with")) { if (current_filter.can_bucket_by("pm-with")) {
pm_string = exports.pm_string(); current_filter_pm_string = exports.pm_string();
if (pm_string === undefined) { if (current_filter_pm_string === undefined) {
return []; return [];
} }
return unread.get_msg_ids_for_person(pm_string); return unread.get_msg_ids_for_person(current_filter_pm_string);
} }
if (current_filter.can_bucket_by("is-private")) { if (current_filter.can_bucket_by("is-private")) {