From d672bb46432772cbcb981d4091a0828e2d1b2364 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 21 Oct 2019 00:46:14 +0900
Subject: [PATCH] =?UTF-8?q?Esc=E3=81=A7=E3=83=A1=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=82=A2=E3=83=93=E3=83=A5=E3=83=BC=E3=83=AF=E3=81=8C=E9=96=89?=
 =?UTF-8?q?=E3=81=98=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#5494?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* EscやBackspaceでメディアビューワが閉じれるように

* Backspaceでは閉じないように
---
 src/client/app/common/scripts/note-mixin.ts              | 2 +-
 src/client/app/common/views/components/image-viewer.vue  | 9 ++++++++-
 .../app/desktop/views/components/media-video-dialog.vue  | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index 54e90714e7..43fb4fd51e 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -43,7 +43,7 @@ export default (opts: Opts = {}) => ({
 				'ctrl+q': this.renoteDirectly,
 				'up|k|shift+tab': this.focusBefore,
 				'down|j|tab': this.focusAfter,
-				'esc': this.blur,
+				//'esc': this.blur,
 				'm|o': () => this.menu(true),
 				's': this.toggleShowContent,
 				'1': () => this.reactDirectly('like'),
diff --git a/src/client/app/common/views/components/image-viewer.vue b/src/client/app/common/views/components/image-viewer.vue
index e668a2f46b..7787942ca8 100644
--- a/src/client/app/common/views/components/image-viewer.vue
+++ b/src/client/app/common/views/components/image-viewer.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="dkjvrdxtkvqrwmhfickhndpmnncsgacq">
+<div class="dkjvrdxtkvqrwmhfickhndpmnncsgacq" v-hotkey.global="keymap">
 	<div class="bg" @click="close"></div>
 	<img :src="image.url" :alt="image.name" :title="image.name" @click="close"/>
 </div>
@@ -19,6 +19,13 @@ export default Vue.extend({
 			easing: 'linear'
 		});
 	},
+	computed: {
+		keymap(): any {
+			return {
+				'esc': this.close,
+			};
+		}
+	},
 	methods: {
 		close() {
 			anime({
diff --git a/src/client/app/desktop/views/components/media-video-dialog.vue b/src/client/app/desktop/views/components/media-video-dialog.vue
index 3c682ecefb..803350506a 100644
--- a/src/client/app/desktop/views/components/media-video-dialog.vue
+++ b/src/client/app/desktop/views/components/media-video-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="mk-media-video-dialog">
+<div class="mk-media-video-dialog" v-hotkey.global="keymap">
 	<div class="bg" @click="close"></div>
 	<video :src="video.url" :title="video.name" controls autoplay ref="video" @volumechange="volumechange"/>
 </div>
@@ -22,6 +22,13 @@ export default Vue.extend({
 		if (this.start) videoTag.currentTime = this.start
 		videoTag.volume = this.$store.state.device.mediaVolume;
 	},
+	computed: {
+		keymap(): any {
+			return {
+				'esc': this.close,
+			};
+		}
+	},
 	methods: {
 		close() {
 			anime({