paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

inline_topic_edit: Hide all recipient bar controls on topic edit.

Browse Source 
This commit hides all the recipient bar controls from the recipient
bar when the topic edit UI opens.

Previously we used to only hide some of the controls while some other
were still visible alongside the save and cancel buttons from the
inline topic edit UI which led to confusion.
This commit is contained in:
Sayam Samal
2025-01-30 17:49:31 +05:30
committed by Tim Abbott
parent 97bbff54f4
commit 1e0318e948
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/message_list.ts
View File

@@ -539,20 +539,16 @@ export class MessageList {
show_edit_topic_on_recipient_row($recipient_row: JQuery, $form: JQuery): void {
$recipient_row.find(".topic_edit_form").append($form);
$recipient_row.find(".on_hover_topic_edit").hide();
$recipient_row.find(".stream_topic").hide();
$recipient_row.find(".topic_edit").show();
$recipient_row.find(".on_hover_topic_resolve").hide();
$recipient_row.find(".on_hover_topic_unresolve").hide();
$recipient_row.find(".recipient-bar-control").hide();
}
hide_edit_topic_on_recipient_row($recipient_row: JQuery): void {
$recipient_row.find(".stream_topic").show();
$recipient_row.find(".on_hover_topic_edit").show();
$recipient_row.find(".topic_edit_form").empty();
$recipient_row.find(".topic_edit").hide();
$recipient_row.find(".on_hover_topic_resolve").show();
$recipient_row.find(".on_hover_topic_unresolve").show();
$recipient_row.find(".recipient-bar-control").show();
}
reselect_selected_id(): void {

12
web/templates/recipient_row.hbs
View File

@@ -42,27 +42,27 @@
{{! exterior links (e.g. to a trac ticket) }}
{{#each topic_links}}
<a href="{{this.url}}" target="_blank" rel="noopener noreferrer" class="external-topic-link no-underline">
<a href="{{this.url}}" target="_blank" rel="noopener noreferrer" class="external-topic-link recipient-bar-control no-underline">
<i class="fa fa-external-link-square recipient_bar_icon" data-tippy-content="Open {{this.text}}" aria-label="{{t 'External link' }}"></i>
</a>
{{/each}}
{{! edit topic pencil icon }}
{{#if is_topic_editable}}
<i class="fa fa-pencil on_hover_topic_edit recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
<i class="fa fa-pencil on_hover_topic_edit recipient-bar-control recipient_bar_icon hidden-for-spectators" data-tippy-content="{{t 'Edit topic'}}" role="button" tabindex="0" aria-label="{{t 'Edit topic' }}"></i>
{{/if}}
{{#if (and user_can_resolve_topic (not is_empty_string_topic))}}
{{#if topic_is_resolved}}
<i class="fa fa-check on_hover_topic_unresolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as unresolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as unresolved' }}"></i>
<i class="fa fa-check on_hover_topic_unresolve recipient-bar-control recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as unresolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as unresolved' }}"></i>
{{else}}
<i class="fa fa-check on_hover_topic_resolve recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i>
<i class="fa fa-check on_hover_topic_resolve recipient-bar-control recipient_bar_icon hidden-for-spectators" data-topic-name="{{topic}}" data-tippy-content="{{t 'Mark as resolved' }}" role="button" tabindex="0" aria-label="{{t 'Mark as resolved' }}"></i>
{{/if}}
<div class="toggle_resolve_topic_spinner" style="display: none"></div>
{{/if}}
{{#if is_subscribed}}
<span class="change_visibility_policy hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}">
<span class="change_visibility_policy recipient-bar-control hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}">
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You follow this topic.' }}"></i>
@@ -80,7 +80,7 @@
{{/if}}
{{! Topic menu }}
<i class="zulip-icon zulip-icon-more-vertical recipient-row-topic-menu recipient_bar_icon" tabindex="0" aria-label="{{t 'Topic actions menu' }}" aria-haspopup="true" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-topic-url="{{topic_url}}"></i>
<i class="zulip-icon zulip-icon-more-vertical recipient-row-topic-menu recipient-bar-control recipient_bar_icon" tabindex="0" aria-label="{{t 'Topic actions menu' }}" aria-haspopup="true" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-topic-url="{{topic_url}}"></i>
</span>
<span class="recipient_row_date {{#if (and (not always_display_date) date_unchanged )}}recipient_row_date_unchanged{{/if}}">{{{date}}}</span>
</div>