Changeset 11568

Timestamp:

02/17/2022 03:09:42 AM (20 months ago)

Author:

dd32

Message:

Support: Also Viewing: Account for the sticky global header.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js

@@ -10 +10 @@
         page = options.currentPage || '',
         banner = false,
+        $adminbar = false,
+        $header = false,
         bannerOffset = 200,
         isTyping = false,
@@ -21 +23 @@
 
     jQuery( document ).ready( function() {
+        $adminbar = jQuery('#wpadminbar');
+        $header = jQuery('header.global-header');
+
         maybeDisplay();
 
@@ -69 +74 @@
             );
             banner.show();
-            bannerOffset = banner.offset().top - jQuery('#wpadminbar').height();
+
+            // If we scroll past this number, we need to stick it to the viewport.
+            // NOTE: There's a bug here - in short screen & mobile viewports it'll switch to fixed too early. meh.
+            bannerOffset = $header.height() - $adminbar.height();
         }
     }
@@ -79 +87 @@
         }
 
-        var $main = jQuery('#main');
+        var offset = 'var(--wp-admin--admin-bar--height, 0px)';
+        if ( 'fixed' === $header.css('position') ) {
+            offset = 'var(--wp-global-header-offset, 0px)';
+        }
+
         if ( jQuery(window).scrollTop() > bannerOffset ) {
             banner.css( 'position', 'fixed' );
-            $main.css( 'padding-top', banner.height() );
+            banner.css( 'top', offset );
         } else {
             banner.css( 'position', 'initial' );
-            $main.css( 'padding-top', 0 );
+            banner.css( 'top', '' );
         }
     } );