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/common/views/components/media-image.vue | 5 ++++-
 src/client/app/common/views/deck/deck.user-column.vue  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/src/client/app/common/views/components/media-image.vue b/src/client/app/common/views/components/media-image.vue
index 6db4b40dd8..b8b164aed0 100644
--- a/src/client/app/common/views/components/media-image.vue
+++ b/src/client/app/common/views/components/media-image.vue
@@ -59,9 +59,12 @@ export default Vue.extend({
 	},
 	methods: {
 		onClick() {
-			this.$root.new(ImageViewer, {
+			const viewer = this.$root.new(ImageViewer, {
 				image: this.image
 			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 });
diff --git a/src/client/app/common/views/deck/deck.user-column.vue b/src/client/app/common/views/deck/deck.user-column.vue
index 1383ff5aef..dd64dd1c12 100644
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/src/client/app/common/views/deck/deck.user-column.vue
@@ -112,10 +112,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