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

resize: Rename reset_compose_textarea_max_height. 

This no logner just resets the max-height of compose-textarea
but also preview_message_area.
This commit is contained in:
Aman Agrawal 2022-02-02 05:06:56 +00:00 committed by Tim Abbott
parent adf8446b51
commit a38b11d188
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/compose.js
View File

@ -749,9 +749,9 @@ test_ui("on_events", ({override, override_rewire}) => {
})(); })();
(function test_markdown_preview_compose_clicked() { (function test_markdown_preview_compose_clicked() {
let reset_compose_textarea_max_height_called = false; let reset_compose_message_max_height_called = false;
override(resize, "reset_compose_textarea_max_height", () => { override(resize, "reset_compose_message_max_height", () => {
reset_compose_textarea_max_height_called = true; reset_compose_message_max_height_called = true;
}); });
// Tests setup // Tests setup
@ -839,7 +839,7 @@ test_ui("on_events", ({override, override_rewire}) => {
assert.equal($("#compose .preview_content").html(), "translated HTML: Nothing to preview"); assert.equal($("#compose .preview_content").html(), "translated HTML: Nothing to preview");
assert_visibilities(); assert_visibilities();
assert.ok(reset_compose_textarea_max_height_called); assert.ok(reset_compose_message_max_height_called);
let make_indicator_called = false; let make_indicator_called = false;
$("#compose-textarea").val("```foobarfoobar```"); $("#compose-textarea").val("```foobarfoobar```");

2
frontend_tests/node_tests/compose_actions.js
View File

@ -45,7 +45,7 @@ mock_esm("../../static/js/message_lists", {
}, },
}); });
mock_esm("../../static/js/resize", { mock_esm("../../static/js/resize", {
reset_compose_textarea_max_height: noop, reset_compose_message_max_height: noop,
}); });
const people = zrequire("people"); const people = zrequire("people");

2
static/js/compose.js
View File

@ -669,7 +669,7 @@ export function initialize() {
$("#compose .preview_content"), $("#compose .preview_content"),
content, content,
); );
resize.reset_compose_textarea_max_height(); resize.reset_compose_message_max_height();
}); });
$("#compose").on("click", ".undo_markdown_preview", (e) => { $("#compose").on("click", ".undo_markdown_preview", (e) => {

2
static/js/compose_actions.js
View File

@ -292,7 +292,7 @@ export function start(msg_type, opts) {
// Reset the `max-height` property of `compose-textarea` so that the // Reset the `max-height` property of `compose-textarea` so that the
// compose-box do not cover the last messages of the current stream // compose-box do not cover the last messages of the current stream
// while writing a long message. // while writing a long message.
resize.reset_compose_textarea_max_height(); resize.reset_compose_message_max_height();
complete_starting_tasks(msg_type, opts); complete_starting_tasks(msg_type, opts);
} }

6
static/js/resize.js
View File

@ -159,7 +159,7 @@ export function watch_manual_resize(element) {
return [box_handler, body_handler]; return [box_handler, body_handler];
} }
export function reset_compose_textarea_max_height(bottom_whitespace_height) { export function reset_compose_message_max_height(bottom_whitespace_height) {
// If the compose-box is open, we set the `max-height` property of // If the compose-box is open, we set the `max-height` property of
// `compose-textarea` and `preview-textarea`, so that the // `compose-textarea` and `preview-textarea`, so that the
// compose-box's maximum extent does not overlap the last message // compose-box's maximum extent does not overlap the last message
@ -194,11 +194,11 @@ export function resize_bottom_whitespace(h) {
// The height of the compose box is tied to that of // The height of the compose box is tied to that of
// bottom_whitespace, so update it if necessary. // bottom_whitespace, so update it if necessary.
// //
// reset_compose_textarea_max_height cannot compute the right // reset_compose_message_max_height cannot compute the right
// height correctly while compose is hidden. This is OK, because // height correctly while compose is hidden. This is OK, because
// we also resize compose every time it is opened. // we also resize compose every time it is opened.
if ($(".message_comp").is(":visible")) { if ($(".message_comp").is(":visible")) {
reset_compose_textarea_max_height(h.bottom_whitespace_height); reset_compose_message_max_height(h.bottom_whitespace_height);
} }
} }