From cfd07d69cfd87fdbc53b47b8aa156df140f64f0b Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@git.wordpress.org>
Date: Wed, 30 Mar 2016 21:54:45 +0000
Subject: [PATCH] Customize: Fix toggle of title attribute field visibility on
 nav menus admin page.

Improves alignment with nav menus in the Customizer, fixing regression introduced in [36908].

See #35273.
Props sidati, westonruter.
Fixes #36353.


git-svn-id: https://develop.svn.wordpress.org/trunk@37153 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/customize-nav-menus.css           |  4 ++--
 .../includes/class-walker-nav-menu-edit.php        |  2 +-
 src/wp-admin/includes/nav-menu.php                 | 14 +++++++-------
 .../class-wp-customize-nav-menu-item-control.php   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css
index a73bdf956f..cc6725e9a5 100644
--- a/src/wp-admin/css/customize-nav-menus.css
+++ b/src/wp-admin/css/customize-nav-menus.css
@@ -271,7 +271,7 @@
 }
 
 #accordion-panel-nav_menus .field-link-target,
-#accordion-panel-nav_menus .field-attr-title,
+#accordion-panel-nav_menus .field-title-attribute,
 #accordion-panel-nav_menus .field-css-classes,
 #accordion-panel-nav_menus .field-xfn,
 #accordion-panel-nav_menus .field-description {
@@ -279,7 +279,7 @@
 }
 
 #accordion-panel-nav_menus.field-link-target-active .field-link-target,
-#accordion-panel-nav_menus.field-attr-title-active .field-attr-title,
+#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,
 #accordion-panel-nav_menus.field-css-classes-active .field-css-classes,
 #accordion-panel-nav_menus.field-xfn-active .field-xfn,
 #accordion-panel-nav_menus.field-description-active .field-description {
diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php
index b13e9d8465..7576de123f 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -165,7 +165,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
 					</label>
 				</p>
-				<p class="field-title-attribute description description-wide">
+				<p class="field-title-attribute field-attr-title description description-wide">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
 						<?php _e( 'Title Attribute' ); ?><br />
 						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php
index d8947d86ee..18dcc97f6c 100644
--- a/src/wp-admin/includes/nav-menu.php
+++ b/src/wp-admin/includes/nav-menu.php
@@ -941,13 +941,13 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'      => __( 'Show advanced menu properties' ),
-		'cb'          => '<input type="checkbox" />',
-		'link-target' => __( 'Link Target' ),
-		'attr-title'  => __( 'Title Attribute' ),
-		'css-classes' => __( 'CSS Classes' ),
-		'xfn'         => __( 'Link Relationship (XFN)' ),
-		'description' => __( 'Description' ),
+		'_title'          => __( 'Show advanced menu properties' ),
+		'cb'              => '<input type="checkbox" />',
+		'link-target'     => __( 'Link Target' ),
+		'title-attribute' => __( 'Title Attribute' ),
+		'css-classes'     => __( 'CSS Classes' ),
+		'xfn'             => __( 'Link Relationship (XFN)' ),
+		'description'     => __( 'Description' ),
 	);
 }
 
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
index 466f214b69..95e7b54df0 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
@@ -105,7 +105,7 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 					<?php _e( 'Open link in a new tab' ); ?>
 				</label>
 			</p>
-			<p class="field-attr-title description description-thin">
+			<p class="field-title-attribute field-attr-title description description-thin">
 				<label for="edit-menu-item-attr-title-{{ data.menu_item_id }}">
 					<?php _e( 'Title Attribute' ); ?><br />
 					<input type="text" id="edit-menu-item-attr-title-{{ data.menu_item_id }}" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title" />