<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36383] trunk/src: Customizer: Add shift-click on nav menu items in preview to focus on corresponding nav menu item controls in pane.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36383">36383</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36383","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-22 21:20:26 +0000 (Fri, 22 Jan 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Add shift-click on nav menu items in preview to focus on corresponding nav menu item controls in pane.

Add missing `params.completeCallback` to `MenuItemControl.focus()` for parity with `Control.focus()`. Also adds `params` to `MenuItemControl.expandForm`, `MenuItemControl.collapseForm()`, and `MenuItemControl.toggleForm()`.

Props MattGeri, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/32681">#32681</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesjscustomizepreviewnavmenusjs">trunk/src/wp-includes/js/customize-preview-nav-menus.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js       2016-01-22 20:21:40 UTC (rev 36382)
+++ trunk/src/wp-admin/js/customize-controls.js 2016-01-22 21:20:26 UTC (rev 36383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object}   [params]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param {Callback} [params.completeCallback]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Function} [params.completeCallback]
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        focus = function ( params ) {
</span><span class="cx" style="display: block; padding: 0 10px">                var construct, completeCallback, focus;
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizenavmenusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-nav-menus.js      2016-01-22 20:21:40 UTC (rev 36382)
+++ trunk/src/wp-admin/js/customize-nav-menus.js        2016-01-22 21:20:26 UTC (rev 36383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1363,24 +1363,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Expand the menu item form control.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *
+                * @since 4.5.0 Added params.completeCallback.
+                *
+                * @param {Object}   [params] - Optional params.
+                * @param {Function} [params.completeCallback] - Function to call when the form toggle has finished animating.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                expandForm: function() {
-                       this.toggleForm( true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         expandForm: function( params ) {
+                       this.toggleForm( true, params );
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Collapse the menu item form control.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *
+                * @since 4.5.0 Added params.completeCallback.
+                *
+                * @param {Object}   [params] - Optional params.
+                * @param {Function} [params.completeCallback] - Function to call when the form toggle has finished animating.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                collapseForm: function() {
-                       this.toggleForm( false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         collapseForm: function( params ) {
+                       this.toggleForm( false, params );
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Expand or collapse the menu item control.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param {boolean|undefined} [showOrHide] If not supplied, will be inverse of current visibility
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @since 4.5.0 Added params.completeCallback.
+                *
+                * @param {boolean}  [showOrHide] - If not supplied, will be inverse of current visibility
+                * @param {Object}   [params] - Optional params.
+                * @param {Function} [params.completeCallback] - Function to call when the form toggle has finished animating.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toggleForm: function( showOrHide ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toggleForm: function( showOrHide, params ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         var self = this, $menuitem, $inside, complete;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        $menuitem = this.container;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,6 +1405,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Already expanded or collapsed.
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $inside.is( ':visible' ) === showOrHide ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                if ( params && params.completeCallback ) {
+                                       params.completeCallback();
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                                 return;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,6 +1424,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                .removeClass( 'menu-item-edit-inactive' )
</span><span class="cx" style="display: block; padding: 0 10px">                                                .addClass( 'menu-item-edit-active' );
</span><span class="cx" style="display: block; padding: 0 10px">                                        self.container.trigger( 'expanded' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                                       if ( params && params.completeCallback ) {
+                                               params.completeCallback();
+                                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                                 };
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                $menuitem.find( '.item-edit' ).attr( 'aria-expanded', 'true' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1419,6 +1440,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                .addClass( 'menu-item-edit-inactive' )
</span><span class="cx" style="display: block; padding: 0 10px">                                                .removeClass( 'menu-item-edit-active' );
</span><span class="cx" style="display: block; padding: 0 10px">                                        self.container.trigger( 'collapsed' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                                       if ( params && params.completeCallback ) {
+                                               params.completeCallback();
+                                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                                 };
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                self.container.trigger( 'collapse' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,14 +1456,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Expand the containing menu section, expand the form, and focus on
</span><span class="cx" style="display: block; padding: 0 10px">                 * the first input in the control.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 *
+                * @since 4.5.0 Added params.completeCallback.
+                *
+                * @param {Object}   [params] - Params object.
+                * @param {Function} [params.completeCallback] - Optional callback function when focus has completed.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                focus: function() {
-                       var control = this, focusable;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         focus: function( params ) {
+                       params = params || {};
+                       var control = this, originalCompleteCallback = params.completeCallback;
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         control.expandControlSection();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        control.expandForm();
-                       // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
-                       focusable = control.container.find( '.menu-item-settings' ).find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' );
-                       focusable.first().focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       params.completeCallback = function() {
+                               var focusable;
+
+                               // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
+                               focusable = control.container.find( '.menu-item-settings' ).find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' );
+                               focusable.first().focus();
+
+                               if ( originalCompleteCallback ) {
+                                       originalCompleteCallback();
+                               }
+                       };
+
+                       control.expandForm( params );
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2445,6 +2487,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                api.previewer.bind( 'refresh', function() {
</span><span class="cx" style="display: block; padding: 0 10px">                        api.previewer.refresh();
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               // Open and focus menu control.
+               api.previewer.bind( 'focus-nav-menu-item-control', api.Menus.focusMenuItemControl );
</ins><span class="cx" style="display: block; padding: 0 10px">         } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php    2016-01-22 20:21:40 UTC (rev 36382)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php      2016-01-22 21:20:26 UTC (rev 36383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,6 +946,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'previewCustomizeNonce' => wp_create_nonce( 'preview-customize_' . $this->manager->get_stylesheet() ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'navMenuInstanceArgs'   => $this->preview_nav_menu_instance_args,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'l10n'                  => array(
+                               'editNavMenuItemTooltip' => __( 'Shift-click to edit this menu item.' ),
+                       ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizepreviewnavmenusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/customize-preview-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-preview-nav-menus.js   2016-01-22 20:21:40 UTC (rev 36382)
+++ trunk/src/wp-includes/js/customize-preview-nav-menus.js     2016-01-22 21:20:26 UTC (rev 36383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                active: false,
</span><span class="cx" style="display: block; padding: 0 10px">                                stylesheet: ''
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        navMenuInstanceArgs: {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 navMenuInstanceArgs: {},
+                       l10n: {}
</ins><span class="cx" style="display: block; padding: 0 10px">                 };
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        api.MenusCustomizerPreview = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +64,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       self.highlightControls();
</ins><span class="cx" style="display: block; padding: 0 10px">                 },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,6 +275,36 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }, this ),
</span><span class="cx" style="display: block; padding: 0 10px">                                refreshDebounceDelay
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                },
+
+               /**
+                * Connect nav menu items with their corresponding controls in the pane.
+                */
+               highlightControls: function() {
+                       var selector = '.menu-item[id^=menu-item-]',
+                               addTooltips;
+
+                       // Open expand the menu item control when shift+clicking the menu item
+                       $( document ).on( 'click', selector, function( e ) {
+                               var navMenuItemParts;
+                               if ( ! e.shiftKey ) {
+                                       return;
+                               }
+
+                               navMenuItemParts = $( this ).attr( 'id' ).match( /^menu-item-(\d+)$/ );
+                               if ( navMenuItemParts ) {
+                                       e.preventDefault();
+                                       e.stopPropagation(); // Make sure a sub-nav menu item will get focused instead of parent items.
+                                       api.preview.send( 'focus-nav-menu-item-control', parseInt( navMenuItemParts[1], 10 ) );
+                               }
+                       });
+
+                       addTooltips = function( e, params ) {
+                               params.newContainer.find( selector ).attr( 'title', settings.l10n.editNavMenuItemTooltip );
+                       };
+
+                       addTooltips( null, { newContainer: $( document.body ) } );
+                       $( document ).on( 'customize-preview-menu-refreshed', addTooltips );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        };
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>