<!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>[33328] trunk/src/wp-includes/js/customize-preview-nav-menus.js: Customizer: Fix previewing certain changes to nav menus.</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/33328">33328</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/33328","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-20 07:44:00 +0000 (Mon, 20 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'>Customizer: Fix previewing certain changes to nav menus.
Addresses regression introduced in <a href="https://core.trac.wordpress.org/changeset/33138">[33138]</a>, where deleted menu items would not be removed from the preview, and changes to a location's assigned menu would likewise not preview. Also makes the binding of the setting change events more robust.
Fixes <a href="https://core.trac.wordpress.org/ticket/33010">#33010</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="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-20 01:45:08 UTC (rev 33327)
+++ trunk/src/wp-includes/js/customize-preview-nav-menus.js 2015-07-20 07:44:00 UTC (rev 33328)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Bootstrap functionality.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> self.init = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var self = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this, initializedSettings = {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== typeof _wpCustomizePreviewNavMenusExports ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.extend( self, _wpCustomizePreviewNavMenusExports );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,6 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> api.each( function( setting, id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setting.id = id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initializedSettings[ setting.id ] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> self.bindListener( setting );
</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">@@ -44,10 +45,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> args = args.slice();
</span><span class="cx" style="display: block; padding: 0 10px"> id = args.shift();
</span><span class="cx" style="display: block; padding: 0 10px"> value = args.shift();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! api.has( id ) ) {
- // Currently customize-preview.js is not creating settings for dynamically-created settings in the pane; so we have to do it
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ setting = api( id );
+ if ( ! setting ) {
+ // Currently customize-preview.js is not creating settings for dynamically-created settings in the pane, so we have to do it.
</ins><span class="cx" style="display: block; padding: 0 10px"> setting = api.create( id, value ); // @todo This should be in core
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( ! setting.id ) {
+ // Currently customize-preview.js doesn't set the id property for each setting, like customize-controls.js does.
</ins><span class="cx" style="display: block; padding: 0 10px"> setting.id = id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( ! initializedSettings[ setting.id ] ) {
+ initializedSettings[ setting.id ] = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( self.bindListener( setting ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setting.callbacks.fireWith( setting, [ setting(), null ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,6 +150,11 @@
</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">+ /**
+ * Refresh the menu(s) associated with a given nav menu location.
+ *
+ * @param {string} location
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> self.refreshMenuLocation = function( location ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var foundInstance = false;
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( self.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,11 +204,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data.theme = self.theme.stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> data[ self.renderQueryVar ] = '1';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Gather settings to send in partial refresh request.
</ins><span class="cx" style="display: block; padding: 0 10px"> customized = {};
</span><span class="cx" style="display: block; padding: 0 10px"> api.each( function( setting, id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var value = setting.get(), shouldSend = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> // @todo Core should propagate the dirty state into the Preview as well so we can use that here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( id === 'nav_menu[' + String( menuId ) + ']' || ( /^nav_menu_item\[/.test( id ) && setting() && menuId === setting().nav_menu_term_id ) ) {
- customized[ id ] = setting.get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Send setting if it is a nav_menu_locations[] setting.
+ shouldSend = shouldSend || /^nav_menu_locations\[/.test( id );
+
+ // Send setting if it is the setting for this menu.
+ shouldSend = shouldSend || id === 'nav_menu[' + String( menuId ) + ']';
+
+ // Send setting if it is one that is associated with this menu, or it is deleted.
+ shouldSend = shouldSend || ( /^nav_menu_item\[/.test( id ) && ( false === value || menuId === value.nav_menu_term_id ) );
+
+ if ( shouldSend ) {
+ customized[ id ] = value;
</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"> data.customized = JSON.stringify( customized );
</span></span></pre>
</div>
</div>
</body>
</html>