Changeset 21929

Timestamp:

09/20/2012 04:28:27 PM (13 years ago)

Author:

lancewillett

Message:

Twenty Twelve: update navigation script to check for missing button and menu children earlier; allows an empty menu to be set without showing the button. See #21678.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (1 diff)
• js/navigation.js (modified) (2 diffs)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -99 +99 @@
      * Adds JavaScript for handling the navigation menu hide-and-show behavior.
      */
-    wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120824', true );
+    wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120920', true );
 
     /*

trunk/wp-content/themes/twentytwelve/js/navigation.js

@@ -8 +8 @@
         menu   = document.getElementById( 'site-navigation' ).getElementsByTagName( 'ul' )[0];
 
-    if ( undefined == button || undefined == menu )
+    if ( undefined === button )
         return false;
+
+    // Hide button if menu is missing or empty.
+    if ( undefined === menu || ! menu.childNodes.length ) {
+        button.style.display = 'none';
+        return false;
+    }
 
     button.onclick = function() {
@@ -23 +29 @@
         }
     };
-
-    // Hide menu toggle button if menu is empty.
-    if ( ! menu.childNodes.length )
-        button.style.display = 'none';
 } )();