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

emoji-picker: Do not change scroll on emoji hover. 

Currently when hovering on an emoji it will focus it, which makes
the browser by default scroll down or up to include the entirity
of the focused element. This corects the scrollTop to what it was
before the focus event adjusted the scroll position.

This is a follow-up to #6869.
This commit is contained in:
Brock Whittaker 2017-10-05 12:20:24 -07:00 committed by Tim Abbott
parent b61d667f68
commit a6f5d3d93a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/emoji_picker.js
View File

@ -358,12 +358,21 @@ function update_emoji_showcase($focused_emoji) {
$(".emoji-showcase-container").html(rendered_showcase);
}
function may_be_change_focused_emoji(next_section, next_index) {
function may_be_change_focused_emoji(next_section, next_index, preserve_scroll) {
var next_emoji = get_rendered_emoji(next_section, next_index);
if (next_emoji) {
current_section = next_section;
current_index = next_index;
if (!preserve_scroll) {
next_emoji.focus();
} else {
var $emoji_map = $(".emoji-popover-emoji-map");
var start = $emoji_map.scrollTop();
next_emoji.focus();
if ($emoji_map.scrollTop() !== start) {
$emoji_map.scrollTop(start);
}
}
update_emoji_showcase(next_emoji);
return true;
}
@ -722,7 +731,7 @@ exports.register_click_handlers = function () {
var emoji_id = $(this).data("emoji-id");
var emoji_coordinates = get_emoji_coordinates(emoji_id);
may_be_change_focused_emoji(emoji_coordinates.section, emoji_coordinates.index);
may_be_change_focused_emoji(emoji_coordinates.section, emoji_coordinates.index, true);
});
};