Changeset 30838 for trunk

Timestamp:

12/12/2014 11:58:06 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Fifteen: update scroll functionality to make sure child menu items are always reachable.

Props iamtakashi, fixes #30674.

Location:

trunk/src/wp-content/themes/twentyfifteen

Files:

• functions.php (modified) (1 diff)
• js/functions.js (modified) (1 diff)

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

@@ -227 +227 @@
         }
 
-        wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141010', true );
+        wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141212', true );
         wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
                 'expand'   => '<span class="screen-reader-text">' . esc_html__( 'expand child menu', 'twentyfifteen' ) . '</span>',

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

@@ -67 +67 @@
                 var windowPos = $window.scrollTop();
 
-                if ( 955 <= windowWidth && sidebarHeight + adminbarOffset < bodyHeight ) {
-                        if ( sidebarHeight + adminbarOffset > windowHeight ) {
-                                if ( windowPos > lastWindowPos ) {
-                                        if ( top ) {
-                                                top = false;
-                                                topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
-                                                $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
-                                        } else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top ) {
-                                                bottom = true;
-                                                $sidebar.attr( 'style', 'position: fixed;bottom: 0;' );
-                                        }
-                                } else if ( windowPos < lastWindowPos ) {
-                                        if ( bottom ) {
-                                                bottom = false;
-                                                topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
-                                                $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
-                                        } else if ( ! top && windowPos + adminbarOffset < $sidebar.offset().top ) {
-                                                top = true;
-                                                $sidebar.attr( 'style', 'position: fixed;' );
-                                        }
-                                } else {
-                                        top = bottom = false;
+                if ( 955 > windowWidth ) {
+                        return;
+                }
+
+                if ( sidebarHeight + adminbarOffset > windowHeight ) {
+                        if ( windowPos > lastWindowPos ) {
+                                if ( top ) {
+                                        top = false;
                                         topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
                                         $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
+                                } else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top && sidebarHeight + adminbarOffset < bodyHeight ) {
+                                        bottom = true;
+                                        $sidebar.attr( 'style', 'position: fixed; bottom: 0;' );
                                 }
-                        } else if ( ! top ) {
-                                top = true;
-                                $sidebar.attr( 'style', 'position: fixed;' );
+                        } else if ( windowPos < lastWindowPos ) {
+                                if ( bottom ) {
+                                        bottom = false;
+                                        topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
+                                        $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
+                                } else if ( ! top && windowPos + adminbarOffset < $sidebar.offset().top ) {
+                                        top = true;
+                                        $sidebar.attr( 'style', 'position: fixed;' );
+                                }
+                        } else {
+                                top = bottom = false;
+                                topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
+                                $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
                         }
+                } else if ( ! top ) {
+                        top = true;
+                        $sidebar.attr( 'style', 'position: fixed;' );
                 }