summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-10-09 21:42:23 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-10-09 21:42:23 +0900
commita85f6edd8a98de34fefb94f9c7f4e1a2a6c8b84a (patch)
tree2f0cc9cf59908a7f231235e72787e8dc4aa32431 /src/client/app/desktop/views
parentダウンロードURLにdownloadを付けないなど (#5488) (diff)
downloadsharkey-a85f6edd8a98de34fefb94f9c7f4e1a2a6c8b84a.tar.gz
sharkey-a85f6edd8a98de34fefb94f9c7f4e1a2a6c8b84a.tar.bz2
sharkey-a85f6edd8a98de34fefb94f9c7f4e1a2a6c8b84a.zip
閉じずに残ってしまうメニューなどの修正 (#5496)
* Fix: ページ移動等してもメニュー等が閉じずに残ってしまう * Fix: ページ移動してもメディアビューワーが残ってしまう
Diffstat (limited to 'src/client/app/desktop/views')
-rw-r--r--src/client/app/desktop/views/components/media-video.vue7
-rw-r--r--src/client/app/desktop/views/home/user/user.header.vue5
2 files changed, 9 insertions, 3 deletions
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();
+ });
}
}
});