aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShpuld Shpuldson <shp@cock.li>2020-06-10 11:52:46 +0300
committerShpuld Shpuldson <shp@cock.li>2020-06-10 11:52:46 +0300
commit855b8d4dad54d89b8ce34eb9c8fb9993df58db3e (patch)
tree24dc3c64bbb13429d983f5966f12bb3eeb7a7937
parentd3187720c5cb2599b2dc2d83898e3f6d544cb6ae (diff)
parent4f66221adc6afe85523d90900adcc616ec0c2cec (diff)
fix conflict
-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 dc1be973..b9beee43 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 873328f5..e23e9e48 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -103,7 +103,7 @@
:disabled="posting"
class="form-post-body"
@keydown.meta.enter="postStatus(newStatus)"
- @keyup.ctrl.enter="postStatus(newStatus)"
+ @keydown.ctrl.enter="postStatus(newStatus)"
@input="resize"
@compositionupdate="resize"
@paste="paste"