Open annotation automatically on link click

MaMpf-HD · Aug 3, 2024 · c6ef83c · c6ef83c
1 parent b98e4a0
commit c6ef83c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/app/assets/javascripts/thyme/thyme_player.js b/app/assets/javascripts/thyme/thyme_player.js
@@ -1,3 +1,12 @@
+function openAnnotationIfSpecifiedInUrl() {
+  const annotationValue = new URLSearchParams(window.location.search).get("ann");
+  if (!annotationValue) {
+    return;
+  }
+  const annotationId = Number(annotationValue);
+  thymeAttributes.annotationArea.showAnnotationWithId(annotationId);
+}
+
 $(document).on("turbolinks:load", function () {
   /*
     VIDEO INITIALIZATION
@@ -96,7 +105,9 @@ $(document).on("turbolinks:load", function () {
   thymeAttributes.annotationManager = annotationManager;
 
   // update annotations manually once as initialization
-  annotationManager.updateAnnotations();
+  annotationManager.updateAnnotations(() => {
+    openAnnotationIfSpecifiedInUrl();
+  });
 
   // Update annotations after deleting an annotation
   const ANNOTATION_DELETE_SELECTOR = "#annotation-delete-button";

diff --git a/app/controllers/annotations_overview_controller.rb b/app/controllers/annotations_overview_controller.rb
@@ -3,10 +3,12 @@ class AnnotationsOverviewController < ApplicationController
 
   def show
     @user_annotations = Annotation.where(user_id: current_user.id).map do |annotation|
+      link = helpers.video_link_timed(annotation.medium_id, annotation.timestamp)
+      link += "&ann=#{annotation.id}"
       {
         category: annotation.category,
         text: annotation.comment_optional,
-        link: helpers.video_link_timed(annotation.medium_id, annotation.timestamp),
+        link: link,
         color: annotation.color,
         updated_at: annotation.updated_at
       }