[FINNA-2477] Fix event listeners (NatLibFi#3016)

LuomaJuha · Sep 4, 2024 · ffb9991 · ffb9991
1 parent 8c0f164
commit ffb9991
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/themes/finna2/js/finna-layout.js b/themes/finna2/js/finna-layout.js
@@ -397,12 +397,12 @@ finna.layout = (function finnaLayout() {
     if (!document.addEventListener) {
       return;
     }
-    document.addEventListener('VuFind.sidefacets.loaded', function onSideFacetsLoaded() {
+    VuFind.listen('VuFind.sidefacets.loaded', function onSideFacetsLoaded() {
       finna.dateRangeVis.init();
       initToolTips($('.sidebar'));
       initMobileNarrowSearch();
       VuFind.lightbox.bind($('.sidebar'));
-    });
+    }, {once: true});
   }
 
   function initPiwikPopularSearches() {
@@ -467,7 +467,7 @@ finna.layout = (function finnaLayout() {
     if (!document.addEventListener) {
       return;
     }
-    document.addEventListener('VuFind.lightbox.login', function onLightboxLogin(e) {
+    VuFind.listen('lightbox.login', function onLightboxLogin(e) {
       if ($('body').hasClass('template-name-home') && !e.detail.formUrl.match(/catalogLogin/) && !e.detail.formUrl.match(/\Save/) && !e.detail.formUrl.match(/%2[fF]Save/)) {
         window.location.href = VuFind.path + '/MyResearch/Home';
         e.preventDefault();

diff --git a/themes/finna2/js/finna-video-element.js b/themes/finna2/js/finna-video-element.js
@@ -339,9 +339,7 @@ class VideoElement extends HTMLElement {
   connectedCallback() {
     // Wait for the cookie consent to be initialized
     if (VuFind.cookie.getConsentConfig() === null) {
-      document.addEventListener('vf-cookie-consent-initialized', () => {
-        this.onConsentInitialized();
-      });
+      VuFind.listen('cookie-consent-initialized', () => this.onConsentInitialized(), {once: true});
     } else {
       this.onConsentInitialized();
     }