paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Make DM identifiers align with new conversations.

Browse Source
This commit is contained in:
Karl Stolley
2023-10-04 14:06:27 -05:00
committed by Tim Abbott
parent 0f084587e0
commit 654469b29f
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/compose_closed_ui.js
View File

@@ -85,14 +85,14 @@ function update_new_conversation_button(btn_text) {
$("#new_conversation_button").text(btn_text); $("#new_conversation_button").text(btn_text);
} }
function update_conversation_button(btn_text) { function update_new_direct_message_button(btn_text) {
$("#left_bar_compose_private_button_big").text(btn_text); $("#new_direct_message_button").text(btn_text);
} }
function update_buttons(text_stream, disable_reply) { function update_buttons(text_stream, disable_reply) {
const text_conversation = $t({defaultMessage: "New direct message"}); const text_conversation = $t({defaultMessage: "New direct message"});
update_new_conversation_button(text_stream); update_new_conversation_button(text_stream);
update_conversation_button(text_conversation); update_new_direct_message_button(text_conversation);
update_reply_button_state(disable_reply); update_reply_button_state(disable_reply);
} }
@@ -172,7 +172,7 @@ export function initialize() {
compose_actions.start("stream", {trigger: "clear topic button"}); compose_actions.start("stream", {trigger: "clear topic button"});
}); });
$("body").on("click", ".compose_private_button", () => { $("body").on("click", ".compose_new_direct_message_button", () => {
compose_actions.start("private", {trigger: "new direct message"}); compose_actions.start("private", {trigger: "new direct message"});
}); });
} }

2
web/src/compose_popovers.js
View File

@@ -47,7 +47,7 @@ export function initialize() {
e.stopPropagation(); e.stopPropagation();
instance.hide(); instance.hide();
}); });
$popper.one("click", ".compose_mobile_private_button", (e) => { $popper.one("click", ".compose_mobile_direct_message_button", (e) => {
compose_actions.start("private"); compose_actions.start("private");
e.stopPropagation(); e.stopPropagation();
instance.hide(); instance.hide();

2
web/src/compose_tooltips.js
View File

@@ -20,7 +20,7 @@ export function initialize() {
"#compose_buttons > .reply_button_container", "#compose_buttons > .reply_button_container",
"#left_bar_compose_mobile_button_big", "#left_bar_compose_mobile_button_big",
"#new_conversation_button", "#new_conversation_button",
"#left_bar_compose_private_button_big", "#new_direct_message_button",
], ],
delay: EXTRA_LONG_HOVER_DELAY, delay: EXTRA_LONG_HOVER_DELAY,
appendTo: () => document.body, appendTo: () => document.body,

4
web/styles/compose.css
View File

@@ -43,7 +43,7 @@
} }
.new_conversation_button_container, .new_conversation_button_container,
.private_button_container { .new_direct_message_button_container {
@media (width < $sm_min) { @media (width < $sm_min) {
display: none; display: none;
} }
@@ -1001,7 +1001,7 @@ textarea.new_message_textarea,
} }
.compose_mobile_stream_button i, .compose_mobile_stream_button i,
.compose_mobile_private_button i { .compose_mobile_direct_message_button i {
margin-right: 4px; margin-right: 4px;
} }

6
web/templates/compose.hbs
View File

@@ -33,9 +33,9 @@
</button> </button>
</span> </span>
{{#unless embedded }} {{#unless embedded }}
<span class="new_message_button private_button_container"> <span class="new_message_button new_direct_message_button_container">
<button type="button" class="button small rounded compose_private_button" <button type="button" class="button small rounded compose_new_direct_message_button"
id="left_bar_compose_private_button_big" id="new_direct_message_button"
data-tooltip-template-id="new_direct_message_button_tooltip_template"> data-tooltip-template-id="new_direct_message_button_tooltip_template">
{{t 'New direct message' }} {{t 'New direct message' }}
</button> </button>

2
web/templates/popovers/mobile_message_buttons_popover.hbs
View File

@@ -10,7 +10,7 @@
</a> </a>
</li> </li>
<li> <li>
<a class="compose_mobile_private_button"> <a class="compose_mobile_direct_message_button">
<i class="fa fa-envelope" aria-hidden="true"></i> <i class="fa fa-envelope" aria-hidden="true"></i>
{{#if is_in_private_narrow }} {{#if is_in_private_narrow }}
{{t "New direct message" }} {{t "New direct message" }}

4
web/tests/compose.test.js
View File

@@ -780,7 +780,7 @@ test_ui("narrow_button_titles", ({override}) => {
$t({defaultMessage: "Start new conversation"}), $t({defaultMessage: "Start new conversation"}),
); );
assert.equal( assert.equal(
$("#left_bar_compose_private_button_big").text(), $("#new_direct_message_button").text(),
$t({defaultMessage: "New direct message"}), $t({defaultMessage: "New direct message"}),
); );
@@ -790,7 +790,7 @@ test_ui("narrow_button_titles", ({override}) => {
$t({defaultMessage: "Start new conversation"}), $t({defaultMessage: "Start new conversation"}),
); );
assert.equal( assert.equal(
$("#left_bar_compose_private_button_big").text(), $("#new_direct_message_button").text(),
$t({defaultMessage: "New direct message"}), $t({defaultMessage: "New direct message"}),
); );
}); });