mirror of
https://github.com/zulip/zulip.git
synced 2025-11-07 07:23:22 +00:00
mark as read: Fix banner not closing when x is clicked.
Previously, the X in the mark-as-read banner did nothing.
This commit is contained in:
@@ -14,9 +14,22 @@ import * as unread from "./unread";
|
||||
import {notify_server_messages_read} from "./unread_ops";
|
||||
|
||||
let last_mention_count = 0;
|
||||
|
||||
let user_closed_mark_as_read_turned_off_banner = false;
|
||||
export function hide_mark_as_read_turned_off_banner() {
|
||||
$("#mark_as_read_turned_off_banner").hide();
|
||||
// Use visibility instead of hide() to prevent messages on the screen from
|
||||
// shifting vertically.
|
||||
$("#mark_as_read_turned_off_banner").toggleClass("invisible", true);
|
||||
}
|
||||
|
||||
export function reset_mark_as_read_turned_off_banner() {
|
||||
hide_mark_as_read_turned_off_banner();
|
||||
user_closed_mark_as_read_turned_off_banner = false;
|
||||
}
|
||||
|
||||
export function notify_messages_remain_unread() {
|
||||
if (!user_closed_mark_as_read_turned_off_banner) {
|
||||
$("#mark_as_read_turned_off_banner").toggleClass("invisible", false);
|
||||
}
|
||||
}
|
||||
|
||||
function do_new_messages_animation($li) {
|
||||
@@ -97,15 +110,11 @@ export function should_display_bankruptcy_banner() {
|
||||
return false;
|
||||
}
|
||||
|
||||
export function notify_messages_remain_unread() {
|
||||
$("#mark_as_read_turned_off_banner").show();
|
||||
}
|
||||
|
||||
export function initialize() {
|
||||
update_unread_counts();
|
||||
|
||||
$("#mark_as_read_turned_off_banner").html(render_mark_as_read_turned_off_banner());
|
||||
$("#mark_as_read_turned_off_banner").hide();
|
||||
hide_mark_as_read_turned_off_banner();
|
||||
$("#mark_view_read").on("click", () => {
|
||||
// Mark all messages in the current view as read.
|
||||
//
|
||||
@@ -117,6 +126,10 @@ export function initialize() {
|
||||
.filter((message) => unread.message_unread(message));
|
||||
notify_server_messages_read(unread_messages);
|
||||
|
||||
$("#mark_as_read_turned_off_banner").hide();
|
||||
hide_mark_as_read_turned_off_banner();
|
||||
});
|
||||
$("#mark_as_read_close").on("click", () => {
|
||||
hide_mark_as_read_turned_off_banner();
|
||||
user_closed_mark_as_read_turned_off_banner = true;
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user