diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-12-14 16:36:56 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-12-14 16:36:56 +0000 |
| commit | c3def18f3a6e4a8640819fa13e3f46e862a0bbcb (patch) | |
| tree | deaf27e44252ddfc986c4fe9d6a8838a4f889f2a /modules | |
| parent | 527a054952f48b350641b82f4bd6d37390b54d0a (diff) | |
| download | brdo-c3def18f3a6e4a8640819fa13e3f46e862a0bbcb.tar.gz brdo-c3def18f3a6e4a8640819fa13e3f46e862a0bbcb.tar.bz2 | |
#650832 by Gábor Hojtsy: Fixed shortcut bar collapse / overlay interaction.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/overlay/overlay-parent.js | 4 | ||||
| -rw-r--r-- | modules/overlay/overlay.module | 1 |
2 files changed, 3 insertions, 2 deletions
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'; } /** |