UHF-8839: Add view id indentifier for selector

City-of-Helsinki · Sep 20, 2023 · c28a390 · c28a390
1 parent b24ae46
commit c28a390
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/js/search-helper.js b/src/js/search-helper.js
@@ -2,7 +2,11 @@
 
   // Set focus on search result count
   $(document).ajaxComplete(function onDataLoaded(e, xhr, settings) {
-    const resultCountEl = $('.unit-search__count-container')[0];
+    // Check form ID to prevent mixing on multi-form page
+    const viewDomId = settings.extraData.view_dom_id;
+    const resultsContainerEl = $(`[data-id-number=${  viewDomId  }]`);
+    const resultCountEl = $(resultsContainerEl[0]).find('.unit-search__count-container')[0];
+
     if (!resultCountEl) return;
     resultCountEl.setAttribute('tabindex', '-1');
     resultCountEl.focus();