Index: toolbar.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/toolbar/toolbar.js,v
retrieving revision 1.1.2.1.2.1
diff -r1.1.2.1.2.1 toolbar.js
1c1
< // $Id$
---
> /* $Id$ */
3a4,28
> 
>   if ( Drupal.behaviors.adminMenu ) {
>     // admin_menu active
>     var adminMenuHeight = $('div#admin-menu').height();
>     $('div#toolbar-toolbar').css('top', adminMenuHeight + 'px');
> 
>     // check if admin_menu position fixed is true
>     if ( !Drupal.settings.admin_menu.position_fixed ) {
>       // admin_menu is not fixed
>       $(window).scroll(function() {
> 
>         // get window scroll position
>         var top = $(window).scrollTop();
> 
>         // if window scroll position is less then adminMenuHeight then add adminMenuHeight to toolbars top position
>         // otherwize set toolbar at top (admin_menu is not visible)
>         if ( top <= adminMenuHeight) {
>           $('div#toolbar-toolbar').css('top', adminMenuHeight + 'px');
>         } else {
>           $('div#toolbar-toolbar').css('top', '0px');
>         }
>       });
>     }
>   }
> 
24a50
>