Merge branch 'feature/3696_hoverIntent_tours' into develop

DOAJ · Nov 23, 2023 · aa8ef6b · aa8ef6b
2 parents ce2e11c + ba98620
commit aa8ef6b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/cms/sass/components/_dropdown.scss b/cms/sass/components/_dropdown.scss
@@ -15,10 +15,6 @@
   }
 }
 
-.dropdown--notifications {
-  @extend .dropdown;
-}
-
 .dropdown__menu {
   display: none;
   padding: 0;

diff --git a/portality/static/js/notifications.js b/portality/static/js/notifications.js
@@ -58,7 +58,7 @@ doaj.notifications.notificationsReceived = function(data) {
     }
 
     $(".notification_action_link").on("click", doaj.notifications.notificationClicked);
-    $(".dropdown--notifications").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
+    $("#notifications_nav").hoverIntent(doaj.notifications.showDropdown, doaj.notifications.hideDropdown);
 }
 
 doaj.notifications.showDropdown = function(e) {

diff --git a/portality/static/js/tourist.js b/portality/static/js/tourist.js
@@ -15,6 +15,17 @@ doaj.tourist.init = function(params) {
     if (first) {
         doaj.tourist.start(first);
     }
+
+    $("#dropdown--tour_nav").hoverIntent(doaj.tourist.showDropdown, doaj.tourist.hideDropdown);
+}
+
+doaj.tourist.showDropdown = function(e) {
+    console.log("showDropdown` called")
+    $("#feature_tours").show();
+}
+doaj.tourist.hideDropdown = function() {
+    console.log("showDropdown` called")
+    $("#feature_tours").hide();
 }
 
 doaj.tourist.findNextTour = function() {

diff --git a/portality/templates/includes/_tourist_nav.html b/portality/templates/includes/_tourist_nav.html
@@ -2,10 +2,10 @@
 {% set tours = tourservice.activeTours(request.path, current_user) %}
 
 {% if tours|length > 0 %}
-<li class="dropdown flex-center">
-    <span id="feature_tour_nav" class="dropdown__trigger label" role="button" aria-haspopup="true" aria-expanded="false">
+<li class="dropdown flex-center" id="dropdown--tour_nav">
+    <a id="feature_tour_nav" class="dropdown__trigger label" role="button" aria-haspopup="true" aria-expanded="false">
       <span><span data-feather="navigation" aria-hidden="true"></span> Feature Tours</span>
-    </span>
+    </a>
     <ul class="dropdown__menu notifications" id="feature_tours">
         {% for tour in tours %}
             {% set seen = namespace(val="[new] ") %}

diff --git a/portality/templates/layouts/dashboard_base.html b/portality/templates/layouts/dashboard_base.html
@@ -26,7 +26,7 @@ <h2 class="sr-only">DOAJ Dashboard</h2>
         <ul class="unstyled-list flex-center">
             {% include "includes/_tourist_nav.html" %}
             {# ~~->Notifications:Feature~~ #}
-          <li class="dropdown--notifications flex-center" id="notifications_nav">
+          <li class="dropdown flex-center" id="notifications_nav">
             <a href="/dashboard/notifications" class="dropdown__trigger label" id="dropdown__trigger--notifications" role="button" aria-haspopup="true" aria-expanded="false">
               <span><span data-feather="bell" aria-hidden="true"></span> Notifications <span class="js-notifications-count"></span></span>
             </a>