summaryrefslogtreecommitdiff
path: root/src/client/components/note.vue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-02-21 13:38:29 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-02-21 13:38:29 +0900
commit3d68a0988bb40567e71a23cbe809d9eff4e1a2c0 (patch)
treedbecada3558bfaeef7ae72a44c0e643f678f252a /src/client/components/note.vue
parentMerge branch 'develop' (diff)
parent12.71.0 (diff)
downloadmisskey-3d68a0988bb40567e71a23cbe809d9eff4e1a2c0.tar.gz
misskey-3d68a0988bb40567e71a23cbe809d9eff4e1a2c0.tar.bz2
misskey-3d68a0988bb40567e71a23cbe809d9eff4e1a2c0.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/components/note.vue')
-rw-r--r--src/client/components/note.vue8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/client/components/note.vue b/src/client/components/note.vue
index d532289857..24c374869d 100644
--- a/src/client/components/note.vue
+++ b/src/client/components/note.vue
@@ -731,7 +731,13 @@ export default defineComponent({
};
if (isLink(e.target)) return;
if (window.getSelection().toString() !== '') return;
- os.contextMenu(this.getMenu(), e).then(this.focus);
+
+ if (this.$store.state.useReactionPickerForContextMenu) {
+ e.preventDefault();
+ this.react();
+ } else {
+ os.contextMenu(this.getMenu(), e).then(this.focus);
+ }
},
menu(viaKeyboard = false) {