From 04049e35e9d8d3d49a409336e76990822332d5de Mon Sep 17 00:00:00 2001 From: khawkins98 <khawkins98@gmail.com> Date: Thu, 2 Nov 2017 13:49:04 +0000 Subject: [PATCH] Improve peek behaviour --- .../script/4_ebiFrameworkContent.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/js/ebi-global-includes/script/4_ebiFrameworkContent.js b/js/ebi-global-includes/script/4_ebiFrameworkContent.js index b00c111c..bbb7590c 100644 --- a/js/ebi-global-includes/script/4_ebiFrameworkContent.js +++ b/js/ebi-global-includes/script/4_ebiFrameworkContent.js @@ -194,14 +194,22 @@ function ebiFrameworkInsertEMBLdropdown() { var emblBarButton = document.querySelectorAll(".embl-selector")[0]; var blackBar = document.querySelectorAll(".masthead-black-bar")[0]; + // utility function to see if element has a class + // hasClass(element, 'class-deska'); + function hasClass(element, cls) { + return (' ' + element.className + ' ').indexOf(' ' + cls + ' ') > -1; + } + // add "peeking" animation for embl selector emblBarButton.addEventListener("mouseenter", function( event ) { - blackBar.className += ' peek'; - - // reset the peeking after a short delay - setTimeout(function() { + if (hasClass(document.querySelectorAll(".embl-bar")[0], 'active') == false) { + blackBar.className += ' peek'; + } + }, false); + emblBarButton.addEventListener("mouseleave", function( event ) { + if (hasClass(document.querySelectorAll(".embl-bar")[0], 'active') == false) { blackBar.classList.remove("peek"); - }, 500); + } }, false); -- GitLab