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

compose: Fix narrow button text when switching to PM. 

This changes the "new private message" button to be instead "new
conversation" when looking at PMs, to avoid confusion that the button
was the right thing to do to reply to the current private message
conversation.

Fixes #11679.
This commit is contained in:
Siddharth Varshney 2019-03-07 04:16:53 +05:30 committed by Tim Abbott
parent aad61c42a3
commit 0d25baedfa
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/compose.js
View File

@ -1690,9 +1690,11 @@ run_test('nonexistent_stream_reply_error', () => {
run_test('narrow_button_titles', () => {
util.is_mobile = () => { return false; };
compose.update_stream_button_for_private();
compose.update_closed_compose_buttons_for_private();
assert.equal($("#left_bar_compose_stream_button_big").text(), i18n.t("New stream message"));
assert.equal($("#left_bar_compose_private_button_big").text(), i18n.t("New conversation"));
compose.update_stream_button_for_stream();
compose.update_closed_compose_buttons_for_stream();
assert.equal($("#left_bar_compose_stream_button_big").text(), i18n.t("New topic"));
assert.equal($("#left_bar_compose_private_button_big").text(), i18n.t("New private message"));
});

6
frontend_tests/node_tests/narrow_activate.js
View File

@ -81,8 +81,8 @@ function test_helper() {
stub('typing_events', 'render_notifications_for_narrow');
stub('ui_util', 'change_tab_to');
stub('unread_ops', 'process_visible');
stub('compose', 'update_stream_button_for_stream');
stub('compose', 'update_stream_button_for_private');
stub('compose', 'update_closed_compose_buttons_for_stream');
stub('compose', 'update_closed_compose_buttons_for_private');
stub('notifications', 'hide_history_limit_message');
blueslip.debug = noop;
@ -203,7 +203,7 @@ run_test('basics', () => {
'message_scroll.hide_indicators',
'unread_ops.process_visible',
'hashchange.save_narrow',
'compose.update_stream_button_for_stream',
'compose.update_closed_compose_buttons_for_stream',
'search.update_button_visibility',
'compose_actions.on_narrow',
'top_left_corner.handle_narrow_activated',

27
static/js/compose.js
View File

@ -106,16 +106,27 @@ function update_stream_button(btn_text, title) {
$("#left_bar_compose_stream_button_big").prop("title", title);
}
exports.update_stream_button_for_private = function () {
var text = i18n.t("New stream message");
var title = text + " (c)";
update_stream_button(text, title);
function update_conversation_button(btn_text, title) {
$("#left_bar_compose_private_button_big").text(btn_text);
$("#left_bar_compose_private_button_big").prop("title", title);
}
exports.update_closed_compose_buttons_for_private = function () {
var text_stream = i18n.t("New stream message");
var title_stream = text_stream + " (c)";
var text_conversation = i18n.t("New conversation");
var title_conversation = text_conversation + " (c)";
update_stream_button(text_stream, title_stream);
update_conversation_button(text_conversation, title_conversation);
};
exports.update_stream_button_for_stream = function () {
var text = i18n.t("New topic");
var title = text + " (c)";
update_stream_button(text, title);
exports.update_closed_compose_buttons_for_stream = function () {
var text_stream = i18n.t("New topic");
var title_stream = text_stream + " (c)";
var text_conversation = i18n.t("New private message");
var title_conversation = text_conversation + " (c)";
update_stream_button(text_stream, title_stream);
update_conversation_button(text_conversation, title_conversation);
};
function update_fade() {

6
static/js/narrow.js
View File

@ -255,9 +255,9 @@ exports.activate = function (raw_operators, opts) {
if (filter.has_operator("is") && filter.operands("is")[0] === "private"
|| filter.has_operator("pm-with") || filter.has_operator("group-pm-with")) {
compose.update_stream_button_for_private();
compose.update_closed_compose_buttons_for_private();
} else {
compose.update_stream_button_for_stream();
compose.update_closed_compose_buttons_for_stream();
}
// Put the narrow operators in the search bar.
@ -651,7 +651,7 @@ function handle_post_narrow_deactivate_processes() {
top_left_corner.handle_narrow_deactivated();
stream_list.handle_narrow_deactivated();
compose.update_stream_button_for_stream();
compose.update_closed_compose_buttons_for_stream();
message_edit.handle_narrow_deactivated();
widgetize.set_widgets_for_list();
typing_events.render_notifications_for_narrow();