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

notifications: Avoid misleading href on scroll to bottom notice.

This commit is contained in:
Tim Abbott 2023-02-03 15:19:08 -08:00
parent dd95f79ab7
commit a8ce7df649
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/notifications.js
View File

@ -612,7 +612,6 @@ export function notify_local_mixes(messages, need_user_to_scroll) {
let reason = get_local_notify_mix_reason(message); let reason = get_local_notify_mix_reason(message);
const above_composebox_narrow_url = get_above_composebox_narrow_url(message);
const link_msg_id = message.id; const link_msg_id = message.id;
if (!reason) { if (!reason) {
@ -622,7 +621,8 @@ export function notify_local_mixes(messages, need_user_to_scroll) {
notify_above_composebox( notify_above_composebox(
reason, reason,
"compose_notification_scroll_to_message", "compose_notification_scroll_to_message",
above_composebox_narrow_url, // Don't display a URL on hover for the "Scroll to bottom" link.
null,
link_msg_id, link_msg_id,
link_text, link_text,
); );
@ -634,6 +634,7 @@ export function notify_local_mixes(messages, need_user_to_scroll) {
continue; continue;
} }
const above_composebox_narrow_url = get_above_composebox_narrow_url(message);
const link_class = "compose_notification_narrow_by_topic"; const link_class = "compose_notification_narrow_by_topic";
const link_text = $t( const link_text = $t(
{defaultMessage: "Narrow to {message_recipient}"}, {defaultMessage: "Narrow to {message_recipient}"},

2
static/templates/compose_banner/message_sent_banner.hbs
View File

@ -1,4 +1,4 @@
<div class="compose-notifications-content"> <div class="compose-notifications-content">
{{note}} {{#if link_class}}<a href="{{above_composebox_narrow_url}}" class="{{link_class}}" data-message-id="{{link_msg_id}}">{{link_text}}</a>{{/if}} {{note}} {{#if link_class}}<a {{#if above_composebox_narrow_url}}href="{{above_composebox_narrow_url}}"{{/if}} class="{{link_class}}" data-message-id="{{link_msg_id}}">{{link_text}}</a>{{/if}}
<button type="button" class="out-of-view-notification-close close">&times;</button> <button type="button" class="out-of-view-notification-close close">&times;</button>
</div> </div>