From c2a570914a0c259d7d9d34776b25788c01be5ab1 Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Mon, 5 Aug 2013 04:13:31 -0400 Subject: Issue #1216776 by illmasterc, Niklas Fiekas, dawehner: Fixed Two nested contextual links regions are active, when the outer region is hovered. --- modules/contextual/contextual.css | 2 +- modules/contextual/contextual.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/contextual') diff --git a/modules/contextual/contextual.css b/modules/contextual/contextual.css index 3829328c7..93a179630 100644 --- a/modules/contextual/contextual.css +++ b/modules/contextual/contextual.css @@ -77,7 +77,7 @@ div.contextual-links-wrapper ul.contextual-links { -webkit-border-top-left-radius: 4px; /* LTR */ border-radius: 4px 0 4px 4px; /* LTR */ } -.contextual-links-region:hover a.contextual-links-trigger, +a.contextual-links-trigger-active, div.contextual-links-active a.contextual-links-trigger, div.contextual-links-active ul.contextual-links { display: block; diff --git a/modules/contextual/contextual.js b/modules/contextual/contextual.js index ebe509137..4339780ed 100644 --- a/modules/contextual/contextual.js +++ b/modules/contextual/contextual.js @@ -30,6 +30,10 @@ Drupal.behaviors.contextualLinks = { ); // Hide the contextual links when user clicks a link or rolls out of the .contextual-links-region. $region.bind('mouseleave click', Drupal.contextualLinks.mouseleave); + $region.hover( + function() { $trigger.addClass('contextual-links-trigger-active'); }, + function() { $trigger.removeClass('contextual-links-trigger-active'); } + ); // Prepend the trigger. $wrapper.prepend($trigger); }); -- cgit v1.2.3