fix: de-activate dropdown on click-away && fix tooltip

- Remove dropdown from tooltip list Refs: #135
DDMAL · Jul 24, 2024 · 514c4dd · 514c4dd
1 parent c6415a3
commit 514c4dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/index.html b/web-app/django/VIM/apps/instruments/templates/instruments/index.html
@@ -79,18 +79,24 @@ <h4>######</h4>
             <h4 class="ms-3 me-2 my-auto">
               <small>INSTRUMENT LIST</small>
             </h4>
-            <div class="dropdown mx-2 notranslate" id="instrument-language-element">
+            <div class="dropdown mx-2 notranslate"
+                 id="instrument-language-element"
+                 data-bs-toggle="tooltip"
+                 data-bs-title="Instrument Name Language"
+                 aria-label="Instrument Name Language"
+                 aria-pressed="true">
               <button class="btn btn-warning dropdown-toggle position-relative py-0"
                       type="button"
                       aria-expanded="false"
                       data-bs-toggle="dropdown"
                       data-bs-title="Instrument name language">
                 {{ active_language.autonym|title }}
               </button>
-              <ul class="dropdown-menu">
+              <ul class="dropdown-menu umil-dropdown-menu">
                 {% for language in languages %}
                   <li>
-                    <a class="dropdown-item" href="?language={{ language.en_label }}">{{ language.autonym|title }}</a>
+                    <a class="dropdown-item umil-dropdown-item"
+                       href="?language={{ language.en_label }}">{{ language.autonym|title }}</a>
                   </li>
                 {% endfor %}
               </ul>

diff --git a/web-app/django/VIM/static/js/LanguageTooltip.js b/web-app/django/VIM/static/js/LanguageTooltip.js
@@ -1,5 +1,5 @@
 const tooltipTriggerList = document.querySelectorAll(
-  '[data-bs-toggle="tooltip"], [data-bs-toggle="dropdown"]'
+  '[data-bs-toggle="tooltip"]'
 );
 const tooltipList = [...tooltipTriggerList].map(
   (tooltipTriggerEl) => new bootstrap.Tooltip(tooltipTriggerEl)