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

compose: Extract maybe_scroll_up_selected_message().

Browse Source 
The extraction here is straightforward, but where we put the
caller is a slightly subtle change.  Instead of continuing to
invoke this code at the end of show_box(), we instead call it
at the beginning of complete_starting_tasks().  This change is
valid, because show_box() and complete_starting_tasks() are only
ever called from compose.start().
This commit is contained in:
Steve Howell
2017-04-13 15:08:25 -07:00
committed by Tim Abbott
parent aa5409cf3a
commit 0841320966
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/compose.js
View File

@@ -69,7 +69,9 @@ function show_box(tabname, focus_area, opts) {
opts.trigger !== "message click")) { opts.trigger !== "message click")) {
focus_area.focus().select(); focus_area.focus().select();
} }
}
exports.maybe_scroll_up_selected_message = function () {
// If the compose box is obscuring the currently selected message, // If the compose box is obscuring the currently selected message,
// scroll up until the message is no longer occluded. // scroll up until the message is no longer occluded.
if (current_msg_list.selected_id() === -1) { if (current_msg_list.selected_id() === -1) {
@@ -84,7 +86,7 @@ function show_box(tabname, focus_area, opts) {
message_viewport.user_initiated_animate_scroll(cover+5); message_viewport.user_initiated_animate_scroll(cover+5);
} }
} };
function show_all_everyone_warnings() { function show_all_everyone_warnings() {
var current_stream = stream_data.get_sub(compose.stream_name()); var current_stream = stream_data.get_sub(compose.stream_name());
@@ -287,6 +289,7 @@ exports.complete_starting_tasks = function (msg_type, opts) {
// by compose.start() for now. Having this as a separate function // by compose.start() for now. Having this as a separate function
// makes testing a bit easier. // makes testing a bit easier.
exports.maybe_scroll_up_selected_message();
ui_util.change_tab_to("#home"); ui_util.change_tab_to("#home");
compose_fade.start_compose(msg_type); compose_fade.start_compose(msg_type);
exports.decorate_stream_bar(opts.stream); exports.decorate_stream_bar(opts.stream);