Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations: fix loadEmojiInsane button submitting the form fix scrolling to attachments bottom
This commit is contained in:
commit
1b349bca01
3 changed files with 21 additions and 14 deletions
|
|
@ -89,7 +89,7 @@
|
|||
</div>
|
||||
<button
|
||||
class="btn btn-default"
|
||||
@click="loadEmojiInsane"
|
||||
@click.prevent="loadEmojiInsane"
|
||||
>
|
||||
{{ $t('emoji.load_all', { emojiAmount: filteredEmoji.length } ) }}
|
||||
</button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue