mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
recent_view: Use _html naming convention for content rendered as HTML.
Signed-off-by: apoorvapendse <apoorvavpendse@gmail.com>
This commit is contained in:
committed by
Tim Abbott
parent
03a2d9f644
commit
ceb9367bc4
@@ -614,7 +614,7 @@ type ConversationContext = {
|
|||||||
| {
|
| {
|
||||||
is_private: true;
|
is_private: true;
|
||||||
user_ids_string: string;
|
user_ids_string: string;
|
||||||
rendered_pm_with: string;
|
rendered_pm_with_html: string;
|
||||||
recipient_id: number;
|
recipient_id: number;
|
||||||
pm_url: string;
|
pm_url: string;
|
||||||
is_group: boolean;
|
is_group: boolean;
|
||||||
@@ -713,7 +713,7 @@ function format_conversation(conversation_data: ConversationData): ConversationC
|
|||||||
// Direct message info
|
// Direct message info
|
||||||
const user_ids_string = last_msg.to_user_ids;
|
const user_ids_string = last_msg.to_user_ids;
|
||||||
assert(typeof last_msg.display_recipient !== "string");
|
assert(typeof last_msg.display_recipient !== "string");
|
||||||
const rendered_pm_with = last_msg.display_recipient
|
const rendered_pm_with_html = last_msg.display_recipient
|
||||||
.filter(
|
.filter(
|
||||||
(recipient: DisplayRecipientUser) =>
|
(recipient: DisplayRecipientUser) =>
|
||||||
!people.is_my_user_id(recipient.id) || last_msg.display_recipient.length === 1,
|
!people.is_my_user_id(recipient.id) || last_msg.display_recipient.length === 1,
|
||||||
@@ -759,7 +759,11 @@ function format_conversation(conversation_data: ConversationData): ConversationC
|
|||||||
|
|
||||||
dm_context = {
|
dm_context = {
|
||||||
user_ids_string,
|
user_ids_string,
|
||||||
rendered_pm_with: util.format_array_as_list(rendered_pm_with, "long", "conjunction"),
|
rendered_pm_with_html: util.format_array_as_list(
|
||||||
|
rendered_pm_with_html,
|
||||||
|
"long",
|
||||||
|
"conjunction",
|
||||||
|
),
|
||||||
recipient_id,
|
recipient_id,
|
||||||
pm_url,
|
pm_url,
|
||||||
is_group,
|
is_group,
|
||||||
|
@@ -32,7 +32,7 @@
|
|||||||
<div class="flex_container">
|
<div class="flex_container">
|
||||||
<div class="left_part recent_view_focusable line_clamp" data-col-index="{{ column_indexes.topic }}">
|
<div class="left_part recent_view_focusable line_clamp" data-col-index="{{ column_indexes.topic }}">
|
||||||
{{#if is_private}}
|
{{#if is_private}}
|
||||||
<a href="{{pm_url}}" class="recent-view-table-link {{#if is_group}}recent-view-dm-group{{else}}recent-view-dm{{/if}}">{{{rendered_pm_with}}}</a>
|
<a href="{{pm_url}}" class="recent-view-table-link {{#if is_group}}recent-view-dm-group{{else}}recent-view-dm{{/if}}">{{{rendered_pm_with_html}}}</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<a class="white-space-preserve-wrap recent-view-table-link {{#if is_empty_string_topic}}empty-topic-display{{/if}}" href="{{topic_url}}">{{topic_display_name}}</a>
|
<a class="white-space-preserve-wrap recent-view-table-link {{#if is_empty_string_topic}}empty-topic-display{{/if}}" href="{{topic_url}}">{{topic_display_name}}</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
Reference in New Issue
Block a user