Merge branch 'half-a-ctrl-press' into 'develop'

Attempt to fix that elusive bug with post being sent on copypaste

See merge request pleroma/pleroma-fe!1138
This commit is contained in:
lain 2020-06-10 08:27:01 +00:00
commit 4f66221adc
2 changed files with 2 additions and 1 deletions

View file

@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Removed the use of with_move parameters when fetching notifications - Removed the use of with_move parameters when fetching notifications
### Fixed ### Fixed
- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
- Multiple issues with muted statuses/notifications - Multiple issues with muted statuses/notifications
## [Unreleased patch] ## [Unreleased patch]

View file

@ -96,7 +96,7 @@
:disabled="posting" :disabled="posting"
class="form-post-body" class="form-post-body"
@keydown.meta.enter="postStatus(newStatus)" @keydown.meta.enter="postStatus(newStatus)"
@keyup.ctrl.enter="postStatus(newStatus)" @keydown.ctrl.enter="postStatus(newStatus)"
@drop="fileDrop" @drop="fileDrop"
@dragover.prevent="fileDrag" @dragover.prevent="fileDrag"
@input="resize" @input="resize"