From d3329fe11c763d810facf3a7c6e9a82d5971c502 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Nov 2018 17:25:24 +1030 Subject: [PATCH] Make sure the emoji popup doesn't go off the top of the screen on mobile --- extensions/emoji/js/src/forum/addComposerAutocomplete.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/emoji/js/src/forum/addComposerAutocomplete.js b/extensions/emoji/js/src/forum/addComposerAutocomplete.js index 55e955899..6bb8cc1e4 100644 --- a/extensions/emoji/js/src/forum/addComposerAutocomplete.js +++ b/extensions/emoji/js/src/forum/addComposerAutocomplete.js @@ -11,7 +11,6 @@ import KeyboardNavigatable from 'flarum/utils/KeyboardNavigatable'; import AutocompleteDropdown from './components/AutocompleteDropdown'; export default function addComposerAutocomplete() { - const emojiKeys = Object.keys(emojiMap); extend(ComposerBody.prototype, 'config', function(original, isInitialized) { @@ -150,6 +149,8 @@ export default function addComposerAutocomplete() { if (left + width > parent.width()) { left = parent.width() - width; } + top = Math.max(-$(this).offset().top, top); + left = Math.max(-$(this).offset().left, left); dropdown.show(left, top); } };