<!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>[33491] trunk/src: Twenty Fifteen: Only re-initialize the main navigation in the Customizer when it is specifically updated.</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/33491">33491</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/33491","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>2015-07-29 18:12:26 +0000 (Wed, 29 Jul 2015)</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'>Twenty Fifteen: Only re-initialize the main navigation in the Customizer when it is specifically updated.
* Fix a bug where updating the social menu links would cause the main navigation to get its toggle-expanded buttons duplicated.
* Persist any existing submenu expanded states on the updated menu.
* Improve naming of `customize-preview-menu-refreshed` event param from `wpNavArgs` to `wpNavMenuArgs` (old name is retained and marked as deprecated).
Fixes <a href="https://core.trac.wordpress.org/ticket/33177">#33177</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfifteen/js/functions.js</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="trunksrcwpcontentthemestwentyfifteenjsfunctionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/js/functions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/functions.js 2015-07-29 18:07:03 UTC (rev 33490)
+++ trunk/src/wp-content/themes/twentyfifteen/js/functions.js 2015-07-29 18:12:26 UTC (rev 33491)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,16 +11,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> topOffset = 0, bodyHeight, sidebarHeight, resizeTimer,
</span><span class="cx" style="display: block; padding: 0 10px"> secondary, button;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- function initMainNavigation() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function initMainNavigation( container ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add dropdown toggle that display child menu items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ container.find( '.menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Toggle buttons and submenu items with active children menu items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' );
- $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ container.find( '.current-menu-ancestor > button' ).addClass( 'toggle-on' );
+ container.find( '.current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.dropdown-toggle' ).click( function( e ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ container.find( '.dropdown-toggle' ).click( function( e ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var _this = $( this );
</span><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> _this.toggleClass( 'toggle-on' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,9 +28,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- initMainNavigation();
- $( document ).on( 'customize-preview-menu-refreshed', initMainNavigation );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initMainNavigation( $( '.main-navigation' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Re-initialize the main navigation when it is updated, persisting any existing submenu expanded states.
+ $( document ).on( 'customize-preview-menu-refreshed', function( e, params ) {
+ if ( 'primary' === params.wpNavMenuArgs.theme_location ) {
+ initMainNavigation( params.newContainer );
+
+ // Re-sync expanded states from oldContainer.
+ params.oldContainer.find( '.dropdown-toggle.toggle-on' ).each(function() {
+ var containerId = $( this ).parent().prop( 'id' );
+ $( params.newContainer ).find( '#' + containerId + ' > .dropdown-toggle' ).triggerHandler( 'click' );
+ });
+ }
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> secondary = $( '#secondary' );
</span><span class="cx" style="display: block; padding: 0 10px"> button = $( '.site-branding' ).find( '.secondary-toggle' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2015-07-29 18:07:03 UTC (rev 33490)
+++ trunk/src/wp-includes/js/customize-preview-nav-menus.js 2015-07-29 18:12:26 UTC (rev 33491)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {int} instanceNumber
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> refreshMenuInstance : function( instanceNumber ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var data, menuId, customized, container, request, wpNavArgs, instance, containerInstanceClassName;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var data, menuId, customized, container, request, wpNavMenuArgs, instance, containerInstanceClassName;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! settings.navMenuInstanceArgs[ instanceNumber ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Error( 'unknown_instance_number' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,10 +227,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data.customized = JSON.stringify( customized );
</span><span class="cx" style="display: block; padding: 0 10px"> data[ settings.renderNoncePostKey ] = settings.renderNonceValue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpNavArgs = $.extend( {}, instance );
- data.wp_nav_menu_args_hash = wpNavArgs.args_hash;
- delete wpNavArgs.args_hash;
- data.wp_nav_menu_args = JSON.stringify( wpNavArgs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpNavMenuArgs = $.extend( {}, instance );
+ data.wp_nav_menu_args_hash = wpNavMenuArgs.args_hash;
+ delete wpNavMenuArgs.args_hash;
+ data.wp_nav_menu_args = JSON.stringify( wpNavMenuArgs );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> container.addClass( 'customize-partial-refreshing' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> previousContainer.replaceWith( container );
</span><span class="cx" style="display: block; padding: 0 10px"> eventParam = {
</span><span class="cx" style="display: block; padding: 0 10px"> instanceNumber: instanceNumber,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpNavArgs: wpNavArgs,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpNavArgs: wpNavMenuArgs, // @deprecated
+ wpNavMenuArgs: wpNavMenuArgs,
</ins><span class="cx" style="display: block; padding: 0 10px"> oldContainer: previousContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> newContainer: container
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre>
</div>
</div>
</body>
</html>