summaryrefslogtreecommitdiffstatshomepage
path: root/modules/toolbar/toolbar.js
diff options
context:
space:
mode:
Diffstat (limited to 'modules/toolbar/toolbar.js')
-rw-r--r--modules/toolbar/toolbar.js17
1 files changed, 2 insertions, 15 deletions
diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
index 85129f8243a9..be95c76abaeb 100644
--- a/modules/toolbar/toolbar.js
+++ b/modules/toolbar/toolbar.js
@@ -15,9 +15,8 @@ Drupal.behaviors.toolbar = {
// Toggling toolbar drawer.
$('#toolbar a.toggle', context).once('toolbar-toggle').click(function(e) {
Drupal.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');
+ // Allow resize event handlers to recalculate sizes/positions.
+ $(window).triggerHandler('resize');
return false;
});
}
@@ -49,7 +48,6 @@ Drupal.toolbar.collapse = function() {
.removeClass('toggle-active')
.attr('title', toggle_text)
.html(toggle_text);
- $('body').removeClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
$.cookie(
'Drupal.toolbar.collapsed',
1,
@@ -71,7 +69,6 @@ Drupal.toolbar.expand = function() {
.addClass('toggle-active')
.attr('title', toggle_text)
.html(toggle_text);
- $('body').addClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height());
$.cookie(
'Drupal.toolbar.collapsed',
0,
@@ -95,14 +92,4 @@ Drupal.toolbar.toggle = function() {
}
};
-Drupal.toolbar.height = function() {
- var height = $('#toolbar').outerHeight();
- // In IE, Shadow filter adds some extra height, so we need to remove it from
- // the returned height.
- if ($('#toolbar').css('filter').match(/DXImageTransform\.Microsoft\.Shadow/)) {
- height -= $('#toolbar').get(0).filters.item("DXImageTransform.Microsoft.Shadow").strength;
- }
- return height;
-};
-
})(jQuery);