aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-10 08:27:01 +0000
committerlain <lain@soykaf.club>2020-06-10 08:27:01 +0000
commit4f66221adc6afe85523d90900adcc616ec0c2cec (patch)
treea4de30114dba51a954a5d61994ab92fc380c8bd8
parentaa125072b329a7e2f3ce645d0f2666c9875bc484 (diff)
parentcad42eec2a4cf80026f8ddc072a105d99cb15d15 (diff)
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
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/components/post_status_form/post_status_form.vue2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1467f133..32d72bb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
### Fixed
+- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
- Multiple issues with muted statuses/notifications
## [Unreleased patch]
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 5629ceac..6477594c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -96,7 +96,7 @@
:disabled="posting"
class="form-post-body"
@keydown.meta.enter="postStatus(newStatus)"
- @keyup.ctrl.enter="postStatus(newStatus)"
+ @keydown.ctrl.enter="postStatus(newStatus)"
@drop="fileDrop"
@dragover.prevent="fileDrag"
@input="resize"