Changeset 30324

Timestamp:

11/13/2014 03:08:21 AM (11 years ago)

Author:

iandstewart

Message:

Twenty Fifteen: unfix the sidebar if we have a menu with submenus as there is a chance visitors might not be able to scroll down to see submenus in some situations.

Props mattwiebe, fixes #30208.

File:

• trunk/src/wp-content/themes/twentyfifteen/js/functions.js (modified) (2 diffs)

trunk/src/wp-content/themes/twentyfifteen/js/functions.js

@@ -51 +51 @@
 
     // Sidebar (un)fixing: fix when short, un-fix when scroll needed
-    $body         = $( 'body' );
-    $window       = $( window );
-    sidebar       = $( '#sidebar' )[0];
-    toolbarOffset = $body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
-
     function fixedOrScrolledSidebar() {
         if ( $window.width() >= 955 ) {
@@ -79 +74 @@
     }
 
-    $window.on( 'load.twentyfifteen', fixedOrScrolledSidebar ).on( 'resize.twentyfifteen', debouncedFixedOrScrolledSidebar() );
+
+    $( document ).ready( function() {
+        // But! We only want to allow fixed sidebars when there are no submenus.
+        if ( $( '#site-navigation .sub-menu' ).length ) {
+            return;
+        }
+
+        // only initialize 'em if we need 'em
+        $body         = $( 'body' );
+        $window       = $( window );
+        sidebar       = $( '#sidebar' )[0];
+        toolbarOffset = $body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
+
+        $window
+            .on( 'load.twentyfifteen', fixedOrScrolledSidebar )
+            .on( 'resize.twentyfifteen', debouncedFixedOrScrolledSidebar() );
+    } );
 
 } )( jQuery );