Issue #1216776 by illmasterc, Niklas Fiekas, dawehner: Fixed Two nested contextual links regions are active, when the outer region is hovered.

3 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4e16b5c43..10aa1a505 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
 
 Drupal 7.23, xxxx-xx-xx (development version)
 -----------------------
+- Fixed a bug which caused nested contextual links to display improperly.
 - Fixed a bug which prevented cached image derivatives from being flushed for
   private files and other non-default file schemes.
 - Fixed drupal_render() to always return an empty string when there is no
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);
     });