graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-26 02:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1940 from acid-chicken/acid-chicken-patch-1

Browse source 
投稿できない際にショートカットキーをトリガーしないようにする
This commit is contained in:
syuilo 2018-07-21 02:16:11 +09:00 committed by GitHub
commit bc8bea11c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/common/views/components/messaging-room.form.vue
View file

@ -119,7 +119,7 @@ export default Vue.extend({
}, },
onKeypress(e) { onKeypress(e) {
if ((e.which == 10 || e.which == 13) && e.ctrlKey) { if ((e.which == 10 || e.which == 13) && e.ctrlKey && this.canSend) {
this.send(); this.send();
} }
}, },

2
src/client/app/desktop/views/components/post-form.vue
View file

@ -244,7 +244,7 @@ export default Vue.extend({
}, },
onKeydown(e) { onKeydown(e) {
if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey)) this.post(); if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canPost) this.post();
}, },
onPaste(e) { onPaste(e) {

2
src/client/app/desktop/views/widgets/post-form.vue
View file

@ -45,7 +45,7 @@ export default define({
this.save(); this.save();
}, },
onKeydown(e) { onKeydown(e) {
if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey)) this.post(); if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && !this.posting && this.text) this.post();
}, },
post() { post() {
this.posting = true; this.posting = true;