Fix issues with merge

biigle · Feb 13, 2025 · 2a71366 · 2a71366
1 parent 2259247
commit 2a71366
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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);
     },
 };
 </script>
diff --git a/resources/views/volumes/videos/index/meta.blade.php b/resources/views/volumes/videos/index/meta.blade.php
@@ -1,5 +1,5 @@
 @push('scripts')
-   <script type="text/javascript">
+   <script type="module">
         biigle.$declare('videos.times', {!! collect($video->taken_at) !!});
         biigle.$declare('videos.metadata', {!! collect($video->metadata) !!});
         biigle.$declare('videos.metadataMap', {!! collect($metadataMap) !!});