Changeset 24511

Timestamp:

06/25/2013 09:09:00 PM (13 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: functions.js optimizations, props obenland. Fixes #24643.

Location:

trunk/wp-content/themes/twentythirteen

Files:

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

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

@@ -219 +219 @@
 
     // Loads JavaScript file with functionality specific to Twenty Thirteen.
-    wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130423', true );
+    wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130625', true );
 
     // Loads our main stylesheet.

trunk/wp-content/themes/twentythirteen/js/functions.js

@@ -6 +6 @@
 
 ( function( $ ) {
-    var html               = $( 'html' ),
-        body               = $( 'body' ),
-        _window            = $( window ),
-        adjustFooter,
+    var body    = $( 'body' ),
+        _window = $( window ),
 
     /**
-     * Adds a top margin to the footer if the sidebar widget area is
-     * higher than the rest of the page, to help the footer always
-     * visually clear the sidebar.
+     * Adds a top margin to the footer if the sidebar widget area is higher
+     * than the rest of the page, to help the footer always visually clear
+     * the sidebar.
      */
-    adjustFooter = function() {
-        var sidebar   = $( '#secondary .widget-area' ),
-            secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
-            margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
+    $( function() {
+        if ( body.is( '.sidebar' ) ) {
+            var sidebar   = $( '#secondary .widget-area' ),
+                secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
+                margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
 
-        if ( margin > 0 && _window.innerWidth() > 999 )
-            $( '#colophon' ).css( 'margin-top', margin + 'px' );
-    };
-
-    $( function() {
-        if ( body.is( '.sidebar' ) )
-            adjustFooter();
+            if ( margin > 0 && _window.innerWidth() > 999 )
+                $( '#colophon' ).css( 'margin-top', margin + 'px' );
+        }
     } );
 
@@ -39 +34 @@
 
         button = nav.find( '.menu-toggle' );
-        menu   = nav.find( '.nav-menu' );
         if ( ! button )
             return;
 
         // Hide button if menu is missing or empty.
+        menu = nav.find( '.nav-menu' );
         if ( ! menu || ! menu.children().length ) {
             button.hide();