Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 15:17:42 +02:00
Code Issues Projects Releases Wiki Activity

Customizer: Use valid markup for menu items.

Browse Source 
Replace `<d(l|t)>` with `<div>` for `.menu-item-bar` and `.menu-item-handle`.

see #32724, #32721, #31817.
Built from https://develop.svn.wordpress.org/trunk@32889


git-svn-id: http://core.svn.wordpress.org/trunk@32860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-06-20 18:47:27 +00:00
parent 1d953f8258
commit 2e8245ba0e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-customize-control.php
View File

@ -1553,8 +1553,8 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
*/ */
public function content_template() { public function content_template() {
?> ?>
<dl class="menu-item-bar"> <div class="menu-item-bar">
<dt class="menu-item-handle"> <div class="menu-item-handle">
<span class="item-type">{{ data.item_type_label }}</span> <span class="item-type">{{ data.item_type_label }}</span>
<span class="item-title"> <span class="item-title">
<span class="spinner"></span> <span class="spinner"></span>
@ -1564,8 +1564,8 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
<button type="button" class="not-a-button item-edit"><span class="screen-reader-text"><?php _e( 'Edit Menu Item' ); ?></span></button> <button type="button" class="not-a-button item-edit"><span class="screen-reader-text"><?php _e( 'Edit Menu Item' ); ?></span></button>
<button type="button" class="not-a-button item-delete submitdelete deletion"><span class="screen-reader-text"><?php _e( 'Remove Menu Item' ); ?></span></button> <button type="button" class="not-a-button item-delete submitdelete deletion"><span class="screen-reader-text"><?php _e( 'Remove Menu Item' ); ?></span></button>
</span> </span>
</dt> </div>
</dl> </div>
<div class="menu-item-settings" id="menu-item-settings-{{ data.menu_item_id }}"> <div class="menu-item-settings" id="menu-item-settings-{{ data.menu_item_id }}">
<# if ( 'custom' === data.item_type ) { #> <# if ( 'custom' === data.item_type ) { #>

8
wp-includes/class-wp-customize-nav-menus.php
View File

@ -564,13 +564,13 @@ final class WP_Customize_Nav_Menus {
?> ?>
<script type="text/html" id="tmpl-available-menu-item"> <script type="text/html" id="tmpl-available-menu-item">
<div id="menu-item-tpl-{{ data.id }}" class="menu-item-tpl" data-menu-item-id="{{ data.id }}"> <div id="menu-item-tpl-{{ data.id }}" class="menu-item-tpl" data-menu-item-id="{{ data.id }}">
<dl class="menu-item-bar"> <div class="menu-item-bar">
<dt class="menu-item-handle"> <div class="menu-item-handle">
<span class="item-type">{{ data.type_label }}</span> <span class="item-type">{{ data.type_label }}</span>
<span class="item-title">{{ data.title || wp.customize.Menus.data.l10n.untitled }}</span> <span class="item-title">{{ data.title || wp.customize.Menus.data.l10n.untitled }}</span>
<button type="button" class="not-a-button item-add"><span class="screen-reader-text"><?php _e( 'Add Menu Item' ) ?></span></button> <button type="button" class="not-a-button item-add"><span class="screen-reader-text"><?php _e( 'Add Menu Item' ) ?></span></button>
</dt> </div>
</dl> </div>
</div> </div>
</script> </script>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32888'; $wp_version = '4.3-alpha-32889';
/** /**
* 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.