From a85f6edd8a98de34fefb94f9c7f4e1a2a6c8b84a Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Wed, 9 Oct 2019 21:42:23 +0900
Subject: 閉じずに残ってしまうメニューなどの修正 (#5496)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: ページ移動等してもメニュー等が閉じずに残ってしまう

* Fix: ページ移動してもメディアビューワーが残ってしまう
---
 src/client/app/desktop/views/components/media-video.vue | 7 +++++--
 src/client/app/desktop/views/home/user/user.header.vue  | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/client/app/desktop/views')

diff --git a/src/client/app/desktop/views/components/media-video.vue b/src/client/app/desktop/views/components/media-video.vue
index 7898c47175..c53da0f49e 100644
--- a/src/client/app/desktop/views/components/media-video.vue
+++ b/src/client/app/desktop/views/components/media-video.vue
@@ -53,10 +53,13 @@ export default Vue.extend({
 				start = videoTag.currentTime
 				videoTag.pause()
 			}
-			this.$root.new(MkMediaVideoDialog, {
+			const viewer = this.$root.new(MkMediaVideoDialog, {
 				video: this.video,
 				start,
-			})
+			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 })
diff --git a/src/client/app/desktop/views/home/user/user.header.vue b/src/client/app/desktop/views/home/user/user.header.vue
index 7172803ba7..43a0a782b4 100644
--- a/src/client/app/desktop/views/home/user/user.header.vue
+++ b/src/client/app/desktop/views/home/user/user.header.vue
@@ -106,10 +106,13 @@ export default Vue.extend({
 		},
 
 		menu() {
-			this.$root.new(XUserMenu, {
+			const w = this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
 				user: this.user
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		}
 	}
 });
-- 
cgit v1.2.3-freya