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

bug fix: Clean up blue highlighting in the left corner. 

In a96fdd18b1, I introduced a few
regressions related to the blue highlighting that happens
in the top left corner for Home, Private messages, Starred
messages, and @-mentions.  Basically, we weren't clearing
the highlighting when we thought we were, so Home would stay
blue too long and the other filters wouldn't turn blue.

We went a surprising long time before noticing the regression.
This fix adds a function called deselect_top_left_corner_items()
to clear the blue backgrounds, so that will happen more explicitly.

And then I restored a line of code to pm_list.js that puts the
blue in place when you are in an is:private narrow (vs. a
specific PM narrow).
This commit is contained in:
Steve Howell 2017-02-06 13:50:38 -08:00 committed by Tim Abbott
parent 70388b17d2
commit 0ab832cc49
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/pm_list.js
View File

@ -76,7 +76,6 @@ function zoom_in() {
exports.close = function () { exports.close = function () {
private_messages_open = false; private_messages_open = false;
zoomed_in = false; zoomed_in = false;
$("ul.filters li").removeClass('active-filter active-sub-filter');
remove_expanded_private_messages(); remove_expanded_private_messages();
}; };
@ -166,6 +165,7 @@ exports.update_private_messages = function () {
exports.rebuild_recent(""); exports.rebuild_recent("");
} else if (is_pm_filter) { } else if (is_pm_filter) {
exports.rebuild_recent(""); exports.rebuild_recent("");
$("#global_filters li[data-name='private']").addClass('active-filter');
} }
}; };

6
static/js/stream_list.js
View File

@ -391,6 +391,10 @@ exports.refresh_pinned_or_unpinned_stream = function (sub) {
exports.update_streams_sidebar(); exports.update_streams_sidebar();
}; };
function deselect_top_left_corner_items() {
$("ul.filters li").removeClass('active-filter active-sub-filter');
}
$(function () { $(function () {
// TODO, Eventually topic_list won't be a big singleton, // TODO, Eventually topic_list won't be a big singleton,
// and we can create more component-based click handlers for // and we can create more component-based click handlers for
@ -403,6 +407,7 @@ $(function () {
pm_list.set_click_handlers(); pm_list.set_click_handlers();
$(document).on('narrow_activated.zulip', function (event) { $(document).on('narrow_activated.zulip', function (event) {
deselect_top_left_corner_items();
reset_to_unnarrowed(narrow.stream() === zoomed_stream); reset_to_unnarrowed(narrow.stream() === zoomed_stream);
// TODO: handle confused filters like "in:all stream:foo" // TODO: handle confused filters like "in:all stream:foo"
@ -439,6 +444,7 @@ $(function () {
}); });
$(document).on('narrow_deactivated.zulip', function () { $(document).on('narrow_deactivated.zulip', function () {
deselect_top_left_corner_items();
reset_to_unnarrowed(); reset_to_unnarrowed();
pm_list.close(); pm_list.close();
$("#global_filters li[data-name='home']").addClass('active-filter'); $("#global_filters li[data-name='home']").addClass('active-filter');