Ticket #21562: 21562.2.diff

wp-content/themes/twentytwelve/style.css

@@ -514 +514 @@
 }
 
 /* Navigation Menu */
-.main-navigation {
+.main-navigation .menu {
         display: inline-block;
         margin-top: 24px;
         margin-top: 1.714285714rem;

wp-content/themes/twentytwelve/functions.php

@@ -164 +164 @@
 add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
 
 /**
+ * Prevents menu markup to be shown, when there are no menu items.
+ *
+ * @since Twenty Twelve 1.0
+ * 
+ * @param string $nav_menu Menu markup
+ * @return string Menu markup or empty string
+ */
+function twentytwelve_prevent_empty_menu( $nav_menu ) {
+        
+        // If there are no list items present
+        if ( ! stristr( $nav_menu, '<li') )
+                $nav_menu = '';
+
+        return $nav_menu;
+}
+add_filter( 'wp_nav_menu', 'twentytwelve_prevent_empty_menu' );
+
+/**
  * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
  *
  * @since Twenty Twelve 1.0

wp-content/themes/twentytwelve/js/theme.js

@@ -5 +5 @@
  */
 
 jQuery( document ).ready( function( $ ) {
+        
         var masthead = $( '#masthead' ),
-                largeWindow = window.matchMedia( 'screen and (min-width: 600px)' ),
+                smallWindow = window.matchMedia( 'screen and (max-width: 599px)' ),
                 timeout = false;
-
-        $.fn.smallMenu = function() {
-                masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
-                masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
-
-                $( '.menu-toggle' ).off( 'click' ).click( function() {
-                        masthead.find( '.menu' ).slideToggle();
-                        $( this ).toggleClass( 'toggled-on' );
+        
+        // Check for menu items.
+        if ( '0' != masthead.find( '.menu' ).children().length ) {
+                
+                $.fn.smallMenu = function() {
+                        masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
+                        masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
+        
+                        $( '.menu-toggle' ).off( 'click' ).click( function() {
+                                masthead.find( '.menu' ).slideToggle();
+                                $( this ).toggleClass( 'toggled-on' );
+                        } );
+                };
+                
+                // Check viewport width on first load.
+                if ( smallWindow.matches )
+                        $.fn.smallMenu();
+        
+                // Check viewport width when user resizes the browser window.
+                $( window ).resize( function() {
+                        if ( false !== timeout )
+                                clearTimeout( timeout );
+        
+                        timeout = setTimeout( function() {
+                                if ( smallWindow.matches ) {
+                                        $.fn.smallMenu();
+                                } else {
+                                        masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
+                                        masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
+                                        masthead.find( '.menu' ).removeAttr( 'style' );
+                                }
+                        }, 200 );
                 } );
-        };
-
-        // Check viewport width on first load.
-        if ( ! largeWindow.matches )
-                $.fn.smallMenu();
-
-        // Check viewport width when user resizes the browser window.
-        $( window ).resize( function() {
-                if ( false !== timeout )
-                        clearTimeout( timeout );
-
-                timeout = setTimeout( function() {
-                        if ( ! largeWindow.matches ) {
-                                $.fn.smallMenu();
-                        } else {
-                                masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
-                                masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
-                                masthead.find( '.menu' ).removeAttr( 'style' );
-                        }
-                }, 200 );
-        } );
+        }
 } );
+ No newline at end of file