Merge branch 'emoji-optimizations' into shigusegubu

* emoji-optimizations:
  fix loadEmojiInsane button submitting the form
  fix scrolling to attachments bottom
This commit is contained in:
Henry Jameson 2019-10-27 19:28:54 +02:00
commit 1b349bca01
3 changed files with 21 additions and 14 deletions

View file

@ -89,7 +89,7 @@
</div>
<button
class="btn btn-default"
@click="loadEmojiInsane"
@click.prevent="loadEmojiInsane"
>
{{ $t('emoji.load_all', { emojiAmount: filteredEmoji.length } ) }}
</button>