#668104 by casey and David_Rothstein: Make overlay respect other click handlers.

1 files changed, 4 insertions, 11 deletions

diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
index be69b4a71..061ef7ac6 100644
--- a/modules/toolbar/toolbar.js
+++ b/modules/toolbar/toolbar.js
@@ -11,20 +11,13 @@ Drupal.behaviors.admin = {
     $('#toolbar', context).once('toolbar', Drupal.admin.toolbar.init);
 
     // Toggling toolbar drawer.
-    $('#toolbar a.toggle', context).once('toolbar-toggle').click(function() {
+    $('#toolbar a.toggle', context).once('toolbar-toggle').click(function(e) {
       Drupal.admin.toolbar.toggle();
+      // As the toolbar is an overlay displaced region, overlay should be
+      // notified of it's height change to adapt its position.
+      $(window).triggerHandler('resize.overlay-event');
       return false;
     });
-
-    // Set the most recently clicked item as active.
-    $('#toolbar a').once().click(function() {
-      $('#toolbar a').each(function() {
-        $(this).removeClass('active');
-      });
-      if ($(this).parents('div.toolbar-shortcuts').length) {
-        $(this).addClass('active');
-      }
-    });
   }
 };