From c3def18f3a6e4a8640819fa13e3f46e862a0bbcb Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Mon, 14 Dec 2009 16:36:56 +0000 Subject: =?UTF-8?q?#650832=20by=20G=C3=A1bor=20Hojtsy:=20Fixed=20shortcut?= =?UTF-8?q?=20bar=20collapse=20/=20overlay=20interaction.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/overlay/overlay-parent.js | 4 ++-- modules/overlay/overlay.module | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 4f25e2bdd..88dd43aa1 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -19,8 +19,8 @@ Drupal.behaviors.overlayParent = { // Simulate the native click event for all links that appear outside the // overlay. jQuery UI Dialog prevents all clicks outside a modal dialog. - $('.overlay-displace-top a', context) - .add('.overlay-displace-bottom a', context) + $('.overlay-displace-top a:not(.overlay-displace-no-click)', context) + .add('.overlay-displace-bottom a:not(.overlay-displace-no-click)', context) .click(function () { window.location.href = this.href; }); diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module index 2b3e2382e..d64225858 100644 --- a/modules/overlay/overlay.module +++ b/modules/overlay/overlay.module @@ -282,6 +282,7 @@ function overlay_preprocess_page(&$variables) { */ function overlay_preprocess_toolbar(&$variables) { $variables['classes_array'][] = "overlay-displace-top"; + $variables['toolbar']['toolbar_toggle']['#attributes']['class'][] = 'overlay-displace-no-click'; } /** -- cgit v1.2.3