From 2a71366b09ea1688d2e06019a2db5064126e2908 Mon Sep 17 00:00:00 2001 From: Martin Zurowietz Date: Thu, 13 Feb 2025 14:04:47 +0100 Subject: [PATCH] Fix issues with merge --- .../assets/js/annotations/components/screenshotButton.vue | 3 ++- resources/views/volumes/videos/index/meta.blade.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/annotations/components/screenshotButton.vue b/resources/assets/js/annotations/components/screenshotButton.vue index f0c244a51..c4ddf4418 100644 --- a/resources/assets/js/annotations/components/screenshotButton.vue +++ b/resources/assets/js/annotations/components/screenshotButton.vue @@ -174,7 +174,8 @@ export default { this.filesObj[this.ids[index]] = filename; }); Keyboard.on('p', this.capture); - Events.$on(['annotations.map.init', 'videos.map.init'], this.setMap); + Events.on('videos.map.init', this.setMap); + Events.on('annotations.map.init', this.setMap); }, }; diff --git a/resources/views/volumes/videos/index/meta.blade.php b/resources/views/volumes/videos/index/meta.blade.php index bb11edc14..b21ef2bab 100644 --- a/resources/views/volumes/videos/index/meta.blade.php +++ b/resources/views/volumes/videos/index/meta.blade.php @@ -1,5 +1,5 @@ @push('scripts') -