IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Customizer: Implement indicators for invalid nav menu items.

Browse Source 
The same indicator on the nav menus admin page is now present for nav menu items in the Customizer. When a menu item is present for a post type that is no longer registered, the menu item will appear with the indicator.

Props kucrut, westonruter.
Fixes #33665.

Built from https://develop.svn.wordpress.org/trunk@35302


git-svn-id: http://core.svn.wordpress.org/trunk@35268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2015-10-20 19:08:25 +00:00
parent 0715dc8a4f
commit 6d9d18315d
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/js/customize-nav-menus.js
View File

@ -1250,16 +1250,21 @@
return; return;
} }
var titleEl = control.container.find( '.menu-item-title' ); var titleEl = control.container.find( '.menu-item-title' ),
titleText = item.title || api.Menus.data.l10n.untitled;
if ( item._invalid ) {
titleText = api.Menus.data.l10n.invalidTitleTpl.replace( '%s', titleText );
}
// Don't update to an empty title. // Don't update to an empty title.
if ( item.title ) { if ( item.title ) {
titleEl titleEl
.text( item.title ) .text( titleText )
.removeClass( 'no-title' ); .removeClass( 'no-title' );
} else { } else {
titleEl titleEl
.text( api.Menus.data.l10n.untitled ) .text( titleText )
.addClass( 'no-title' ); .addClass( 'no-title' );
} }
} ); } );
@ -1303,9 +1308,9 @@
'menu-item-edit-inactive' 'menu-item-edit-inactive'
]; ];
if ( settingValue.invalid ) { if ( settingValue._invalid ) {
containerClasses.push( 'invalid' ); containerClasses.push( 'menu-item-invalid' );
control.params.title = api.Menus.data.invalidTitleTpl.replace( '%s', control.params.title ); control.params.title = api.Menus.data.l10n.invalidTitleTpl.replace( '%s', control.params.title );
} else if ( 'draft' === settingValue.status ) { } else if ( 'draft' === settingValue.status ) {
containerClasses.push( 'pending' ); containerClasses.push( 'pending' );
control.params.title = api.Menus.data.pendingTitleTpl.replace( '%s', control.params.title ); control.params.title = api.Menus.data.pendingTitleTpl.replace( '%s', control.params.title );

4
wp-admin/js/customize-nav-menus.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
wp-includes/class-wp-customize-setting.php
View File

@ -885,7 +885,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
'status' => 'publish', 'status' => 'publish',
'original_title' => '', 'original_title' => '',
'nav_menu_term_id' => 0, // This will be supplied as the $menu_id arg for wp_update_nav_menu_item(). 'nav_menu_term_id' => 0, // This will be supplied as the $menu_id arg for wp_update_nav_menu_item().
// @todo also expose invalid? '_invalid' => false,
); );
/** /**
@ -1144,6 +1144,14 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
} }
} }
if ( ! isset( $this->value['_invalid'] ) ) {
$this->value['_invalid'] = (
( 'post_type' === $this->value['type'] && ! post_type_exists( $this->value['object'] ) )
||
( 'taxonomy' === $this->value['type'] && ! taxonomy_exists( $this->value['object'] ) )
);
}
// Remove remaining properties available on a setup nav_menu_item post object which aren't relevant to the setting value. // Remove remaining properties available on a setup nav_menu_item post object which aren't relevant to the setting value.
$irrelevant_properties = array( $irrelevant_properties = array(
'ID', 'ID',
@ -1246,6 +1254,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
$should_remove = ( $should_remove = (
false === $this_item false === $this_item
|| ||
true === $this_item['_invalid']
||
( (
$this->original_nav_menu_term_id === $menu->term_id $this->original_nav_menu_term_id === $menu->term_id
&& &&
@ -1417,6 +1427,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
'status' => 'publish', 'status' => 'publish',
'original_title' => '', 'original_title' => '',
'nav_menu_term_id' => 0, 'nav_menu_term_id' => 0,
'_invalid' => false,
); );
$menu_item_value = array_merge( $default, $menu_item_value ); $menu_item_value = array_merge( $default, $menu_item_value );
$menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) ); $menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
@ -1449,6 +1460,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
$menu_item_value['status'] = 'publish'; $menu_item_value['status'] = 'publish';
} }
$menu_item_value['_invalid'] = (bool) $menu_item_value['_invalid'];
/** This filter is documented in wp-includes/class-wp-customize-setting.php */ /** This filter is documented in wp-includes/class-wp-customize-setting.php */
return apply_filters( "customize_sanitize_{$this->id}", $menu_item_value, $this ); return apply_filters( "customize_sanitize_{$this->id}", $menu_item_value, $this );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35301'; $wp_version = '4.4-alpha-35302';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.