paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Fix banners running off the screen.

Browse Source 
We introduce a scrollable region, with a simplebar scrollbar.

Fixes: #25115.
This commit is contained in:
Daniil Fadeev
2023-04-21 13:33:13 +04:00
committed by Tim Abbott
parent b9223088f3
commit 980f7df376
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/src/compose_validate.js
View File

@@ -15,6 +15,7 @@ import {$t} from "./i18n";
import {page_params} from "./page_params";
import * as peer_data from "./peer_data";
import * as people from "./people";
import * as scroll_util from "./scroll_util";
import * as settings_config from "./settings_config";
import * as settings_data from "./settings_data";
import * as stream_data from "./stream_data";
@@ -25,6 +26,10 @@ let wildcard_mention;
export let wildcard_mention_large_stream_threshold = 15;
export function append_compose_banner_to_banner_list(new_row) {
scroll_util.get_content_element($("#compose_banners")).append(new_row);
}
export function needs_subscribe_warning(user_id, stream_id) {
// This returns true if all of these conditions are met:
// * the user is valid
@@ -105,7 +110,7 @@ export function warn_if_private_stream_is_linked(linked_stream) {
classname: compose_banner.CLASSNAMES.private_stream_warning,
});
$("#compose_banners").append(new_row);
append_compose_banner_to_banner_list(new_row);
}
export function warn_if_mentioning_unsubscribed_user(mentioned) {
@@ -161,7 +166,7 @@ export function warn_if_mentioning_unsubscribed_user(mentioned) {
};
const new_row = render_not_subscribed_warning(context);
$("#compose_banners").append(new_row);
append_compose_banner_to_banner_list(new_row);
}
}
}
@@ -197,7 +202,6 @@ export function warn_if_topic_resolved(topic_changed) {
const stream_name = compose_state.stream_name();
const message_content = compose_state.message_content();
const sub = stream_data.get_sub(stream_name);
const $compose_banner_area = $("#compose_banners");
if (sub && message_content !== "" && resolved_topic.is_resolved(topic_name)) {
if (compose_state.has_recipient_viewed_topic_resolved_banner()) {
@@ -222,7 +226,7 @@ export function warn_if_topic_resolved(topic_changed) {
};
const new_row = render_compose_banner(context);
$compose_banner_area.append(new_row);
append_compose_banner_to_banner_list(new_row);
compose_state.set_recipient_viewed_topic_resolved_banner(true);
} else {
clear_topic_resolved_warning();
@@ -232,7 +236,6 @@ export function warn_if_topic_resolved(topic_changed) {
function show_wildcard_warnings(stream_id) {
const subscriber_count = peer_data.get_subscriber_count(stream_id) || 0;
const $compose_banner_area = $("#compose_banners");
const classname = compose_banner.CLASSNAMES.wildcard_warning;
const wildcard_template = render_wildcard_warning({
banner_type: compose_banner.WARNING,
@@ -246,7 +249,7 @@ function show_wildcard_warnings(stream_id) {
// only show one error for any number of @all or @everyone mentions
if ($(`#compose_banners .${CSS.escape(classname)}`).length === 0) {
$compose_banner_area.append(wildcard_template);
append_compose_banner_to_banner_list(wildcard_template);
}
user_acknowledged_wildcard = false;
@@ -421,7 +424,7 @@ export function validation_error(error_type, stream_name) {
// closing the banner would be more confusing than helpful.
hide_close_button: true,
});
$("#compose_banners").append(new_row);
append_compose_banner_to_banner_list(new_row);
return false;
}
}