Changeset 33488 for trunk/src/wp-includes/default-widgets.php

Timestamp:

07/29/2015 04:02:08 PM (9 years ago)

Author:

westonruter

Message:

Customizer: Ensure that all existing menus are shown in the Custom Menu widget's dropdown.

• Ensure that a Custom Menu widget selecting a newly-inserted menu gets updated to use the new menu ID upon Save & Publish.
• Dynamically update the visibility of the Custom Menu widget's "no menus" message when the number of menus changes between 0 and 1+.
• Send all dirty Customized settings in update-widget Ajax request and preview() them so that the widget update/form callbacks have access to any data dependencies in the current Customizer session (such as newly created unsaved menus).
• Update link in Custom Menu widget to point to Menus panel as opposed to Menus admin page, when in the Customizer.
• Fix an issue with extra space at top immediately after creating new menu.
• Fix doubled update-widget Ajax requests when changing select dropdown; prevent initial from being aborted.
• Add missing wp_get_nav_menus() hooks to preview Customizer updates/inserts for nav_menu settings; includes tests.
• Update wp_get_nav_menu_object() to allow a menu object to be passed in (and thus passed through).

Props westonruter, adamsilverstein.
Fixes #32814.

File:

• trunk/src/wp-includes/default-widgets.php (modified) (1 diff)

trunk/src/wp-includes/default-widgets.php

@@ -1571 +1571 @@
 
         // If no menus exists, direct the user to go and create some.
-        if ( !$menus ) {
-            echo '<p>'. sprintf( __('No menus have been created yet. <a href="%s">Create some</a>.'), admin_url('nav-menus.php') ) .'</p>';
-            return;
-        }
         ?>
-        <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
-            <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo $title; ?>" />
+        <p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+            <?php
+            if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) {
+                // @todo When expanding a panel, the JS should be smart enough to collapse any existing panels and sections.
+                $url = 'javascript: wp.customize.section.each(function( section ){ section.collapse(); }); wp.customize.panel( "nav_menus" ).focus();';
+            } else {
+                $url = admin_url( 'nav-menus.php' );
+            }
+            ?>
+            <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
         </p>
-        <p>
-            <label for="<?php echo $this->get_field_id('nav_menu'); ?>"><?php _e('Select Menu:'); ?></label>
-            <select id="<?php echo $this->get_field_id('nav_menu'); ?>" name="<?php echo $this->get_field_name('nav_menu'); ?>">
-                <option value="0"><?php _e( '&mdash; Select &mdash;' ) ?></option>
-        <?php
-            foreach ( $menus as $menu ) {
-                echo '<option value="' . $menu->term_id . '"'
-                    . selected( $nav_menu, $menu->term_id, false )
-                    . '>'. esc_html( $menu->name ) . '</option>';
-            }
-        ?>
-            </select>
-        </p>
+        <div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+            <p>
+                <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ) ?></label>
+                <input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>"/>
+            </p>
+            <p>
+                <label for="<?php echo $this->get_field_id( 'nav_menu' ); ?>"><?php _e( 'Select Menu:' ); ?></label>
+                <select id="<?php echo $this->get_field_id( 'nav_menu' ); ?>" name="<?php echo $this->get_field_name( 'nav_menu' ); ?>">
+                    <option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+                    <?php foreach ( $menus as $menu ) : ?>
+                        <option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>>
+                            <?php echo esc_html( $menu->name ); ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </p>
+        </div>
         <?php
     }