<!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>[33347] trunk/src/wp-includes/js/customize-preview-nav-menus.js: Customizer: Nav Menus JS cleanup, second round</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/33347">33347</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/33347","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-21 17:39:24 +0000 (Tue, 21 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: Nav Menus JS cleanup, second round
* Follow the same pattern of namespace instantiation that `WidgetCustomizerPreview` uses
* Remove use of `self` for global delegation
* Use `api` for `wp.customize` and import only top-level globals
* Bind `this` where appropriate and disambiguate scope
See <a href="https://core.trac.wordpress.org/ticket/32911">#32911</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-21 17:01:25 UTC (rev 33346)
+++ trunk/src/wp-includes/js/customize-preview-nav-menus.js 2015-07-21 17:39:24 UTC (rev 33347)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global JSON, _wpCustomizePreviewNavMenusExports */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-wp.customize.menusPreview = ( function( $, api ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( $, _, wp ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 'use strict';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var currentRefreshDebounced = {},
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! wp || ! wp.customize ) { return; }
+
+ var api = wp.customize,
+ currentRefreshDebounced = {},
</ins><span class="cx" style="display: block; padding: 0 10px"> refreshDebounceDelay = 200,
</span><span class="cx" style="display: block; padding: 0 10px"> settings = {},
</span><span class="cx" style="display: block; padding: 0 10px"> defaultSettings = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,265 +20,264 @@
</span><span class="cx" style="display: block; padding: 0 10px"> stylesheet: ''
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> navMenuInstanceArgs: {}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- self = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.bind( 'preview-ready', function() {
- api.preview.bind( 'active', function() {
- self.init();
- } );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.MenusCustomizerPreview = {
+ /**
+ * Bootstrap functionality.
+ */
+ init : function() {
+ var self = this, initializedSettings = {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Bootstrap functionality.
- */
- self.init = function() {
- var self = this, initializedSettings = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = _.extend( {}, defaultSettings );
+ if ( 'undefined' !== typeof _wpCustomizePreviewNavMenusExports ) {
+ _.extend( settings, _wpCustomizePreviewNavMenusExports );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- settings = _.extend( {}, defaultSettings );
- if ( 'undefined' !== typeof _wpCustomizePreviewNavMenusExports ) {
- _.extend( settings, _wpCustomizePreviewNavMenusExports );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.each( function( setting, id ) {
+ setting.id = id;
+ initializedSettings[ setting.id ] = true;
+ self.bindListener( setting );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.each( function( setting, id ) {
- setting.id = id;
- initializedSettings[ setting.id ] = true;
- self.bindListener( setting );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.preview.bind( 'setting', function( args ) {
+ var id, value, setting;
+ args = args.slice();
+ id = args.shift();
+ value = args.shift();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.preview.bind( 'setting', function( args ) {
- var id, value, setting;
- args = args.slice();
- id = args.shift();
- value = args.shift();
</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.
+ setting = api.create( id, value ); // @todo This should be in core
+ }
+ if ( ! setting.id ) {
+ // Currently customize-preview.js doesn't set the id property for each setting, like customize-controls.js does.
+ setting.id = id;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; 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.
- setting = api.create( id, value ); // @todo This should be in core
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! initializedSettings[ setting.id ] ) {
+ initializedSettings[ setting.id ] = true;
+ if ( self.bindListener( setting ) ) {
+ setting.callbacks.fireWith( setting, [ setting(), null ] );
+ }
+ }
+ } );
+ },
+
+ /**
+ *
+ * @param {wp.customize.Value} setting
+ * @returns {boolean} Whether the setting was bound.
+ */
+ bindListener : function( setting ) {
+ var matches, themeLocation;
+
+ matches = setting.id.match( /^nav_menu\[(-?\d+)]$/ );
+ if ( matches ) {
+ setting.navMenuId = parseInt( matches[1], 10 );
+ setting.bind( this.onChangeNavMenuSetting );
+ return true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; 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.
- setting.id = id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ matches = setting.id.match( /^nav_menu_item\[(-?\d+)]$/ );
+ if ( matches ) {
+ setting.navMenuItemId = parseInt( matches[1], 10 );
+ setting.bind( this.onChangeNavMenuItemSetting );
+ return true;
</ins><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">- if ( ! initializedSettings[ setting.id ] ) {
- initializedSettings[ setting.id ] = true;
- if ( self.bindListener( setting ) ) {
- setting.callbacks.fireWith( setting, [ setting(), null ] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ matches = setting.id.match( /^nav_menu_locations\[(.+?)]/ );
+ if ( matches ) {
+ themeLocation = matches[1];
+ setting.bind( _.bind( function() {
+ this.refreshMenuLocation( themeLocation );
+ }, this ) );
+ return true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
- };
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- *
- * @param {wp.customize.Value} setting
- * @returns {boolean} Whether the setting was bound.
- */
- self.bindListener = function( setting ) {
- var matches, themeLocation;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- matches = setting.id.match( /^nav_menu\[(-?\d+)]$/ );
- if ( matches ) {
- setting.navMenuId = parseInt( matches[1], 10 );
- setting.bind( self.onChangeNavMenuSetting );
- return true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Handle changing of a nav_menu setting.
+ *
+ * @this {wp.customize.Setting}
+ */
+ onChangeNavMenuSetting : function() {
+ var setting = this;
+ if ( ! setting.navMenuId ) {
+ throw new Error( 'Expected navMenuId property to be set.' );
+ }
+ api.MenusCustomizerPreview.refreshMenu( setting.navMenuId );
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- matches = setting.id.match( /^nav_menu_item\[(-?\d+)]$/ );
- if ( matches ) {
- setting.navMenuItemId = parseInt( matches[1], 10 );
- setting.bind( self.onChangeNavMenuItemSetting );
- return true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Handle changing of a nav_menu_item setting.
+ *
+ * @this {wp.customize.Setting}
+ * @param {object} to
+ * @param {object} from
+ */
+ onChangeNavMenuItemSetting : function( to, from ) {
+ if ( from && from.nav_menu_term_id && ( ! to || from.nav_menu_term_id !== to.nav_menu_term_id ) ) {
+ api.MenusCustomizerPreview.refreshMenu( from.nav_menu_term_id );
+ }
+ if ( to && to.nav_menu_term_id ) {
+ api.MenusCustomizerPreview.refreshMenu( to.nav_menu_term_id );
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- matches = setting.id.match( /^nav_menu_locations\[(.+?)]/ );
- if ( matches ) {
- themeLocation = matches[1];
- setting.bind( function() {
- self.refreshMenuLocation( themeLocation );
- } );
- return true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Update a given menu rendered in the preview.
+ *
+ * @param {int} menuId
+ */
+ refreshMenu : function( menuId ) {
+ var assignedLocations = [];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.each(function( setting, id ) {
+ var matches = id.match( /^nav_menu_locations\[(.+?)]/ );
+ if ( matches && menuId === setting() ) {
+ assignedLocations.push( matches[1] );
+ }
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Handle changing of a nav_menu setting.
- *
- * @this {wp.customize.Setting}
- */
- self.onChangeNavMenuSetting = function() {
- var setting = this;
- if ( ! setting.navMenuId ) {
- throw new Error( 'Expected navMenuId property to be set.' );
- }
- self.refreshMenu( setting.navMenuId );
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( settings.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
+ if ( menuId === navMenuArgs.menu || -1 !== _.indexOf( assignedLocations, navMenuArgs.theme_location ) ) {
+ this.refreshMenuInstanceDebounced( instanceNumber );
+ }
+ }, this );
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Handle changing of a nav_menu_item setting.
- *
- * @this {wp.customize.Setting}
- * @param {object} to
- * @param {object} from
- */
- self.onChangeNavMenuItemSetting = function( to, from ) {
- if ( from && from.nav_menu_term_id && ( ! to || from.nav_menu_term_id !== to.nav_menu_term_id ) ) {
- self.refreshMenu( from.nav_menu_term_id );
- }
- if ( to && to.nav_menu_term_id ) {
- self.refreshMenu( to.nav_menu_term_id );
- }
- };
</del><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
+ */
+ refreshMenuLocation : function( location ) {
+ var foundInstance = false;
+ _.each( settings.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
+ if ( location === navMenuArgs.theme_location ) {
+ this.refreshMenuInstanceDebounced( instanceNumber );
+ foundInstance = true;
+ }
+ }, this );
+ if ( ! foundInstance ) {
+ api.preview.send( 'refresh' );
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Update a given menu rendered in the preview.
- *
- * @param {int} menuId
- */
- self.refreshMenu = function( menuId ) {
- var assignedLocations = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Update a specific instance of a given menu on the page.
+ *
+ * @param {int} instanceNumber
+ */
+ refreshMenuInstance : function( instanceNumber ) {
+ var data, menuId, customized, container, request, wpNavArgs, instance, containerInstanceClassName;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.each(function( setting, id ) {
- var matches = id.match( /^nav_menu_locations\[(.+?)]/ );
- if ( matches && menuId === setting() ) {
- assignedLocations.push( matches[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.navMenuInstanceArgs[ instanceNumber ] ) {
+ throw new Error( 'unknown_instance_number' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ instance = settings.navMenuInstanceArgs[ instanceNumber ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( settings.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
- if ( menuId === navMenuArgs.menu || -1 !== _.indexOf( assignedLocations, navMenuArgs.theme_location ) ) {
- this.refreshMenuInstanceDebounced( instanceNumber );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ containerInstanceClassName = 'partial-refreshable-nav-menu-' + String( instanceNumber );
+ container = $( '.' + containerInstanceClassName );
+
+ if ( _.isNumber( instance.menu ) ) {
+ menuId = instance.menu;
+ } else if ( instance.theme_location && api.has( 'nav_menu_locations[' + instance.theme_location + ']' ) ) {
+ menuId = api( 'nav_menu_locations[' + instance.theme_location + ']' ).get();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, this );
- };
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Refresh the menu(s) associated with a given nav menu location.
- *
- * @param {string} location
- */
- self.refreshMenuLocation = function( location ) {
- var foundInstance = false;
- _.each( settings.navMenuInstanceArgs, function( navMenuArgs, instanceNumber ) {
- if ( location === navMenuArgs.theme_location ) {
- this.refreshMenuInstanceDebounced( instanceNumber );
- foundInstance = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! menuId || ! instance.can_partial_refresh || 0 === container.length ) {
+ api.preview.send( 'refresh' );
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }, this );
- if ( ! foundInstance ) {
- api.preview.send( 'refresh' );
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuId = parseInt( menuId, 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Update a specific instance of a given menu on the page.
- *
- * @param {int} instanceNumber
- */
- self.refreshMenuInstance = function( instanceNumber ) {
- var self = this, data, menuId, customized, container, request, wpNavArgs, instance, containerInstanceClassName;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data = {
+ nonce: settings.previewCustomizeNonce, // for Customize Preview
+ wp_customize: 'on'
+ };
+ if ( ! settings.theme.active ) {
+ data.theme = settings.theme.stylesheet;
+ }
+ data[ settings.renderQueryVar ] = '1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! settings.navMenuInstanceArgs[ instanceNumber ] ) {
- throw new Error( 'unknown_instance_number' );
- }
- instance = settings.navMenuInstanceArgs[ instanceNumber ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Gather settings to send in partial refresh request.
+ customized = {};
+ api.each( function( setting, id ) {
+ var value = setting.get(), shouldSend = false;
+ // @todo Core should propagate the dirty state into the Preview as well so we can use that here.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- containerInstanceClassName = 'partial-refreshable-nav-menu-' + String( instanceNumber );
- container = $( '.' + containerInstanceClassName );
</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 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( _.isNumber( instance.menu ) ) {
- menuId = instance.menu;
- } else if ( instance.theme_location && api.has( 'nav_menu_locations[' + instance.theme_location + ']' ) ) {
- menuId = api( 'nav_menu_locations[' + instance.theme_location + ']' ).get();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send setting if it is the setting for this menu.
+ shouldSend = shouldSend || id === 'nav_menu[' + String( menuId ) + ']';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! menuId || ! instance.can_partial_refresh || 0 === container.length ) {
- api.preview.send( 'refresh' );
- return;
- }
- menuId = parseInt( menuId, 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data = {
- nonce: settings.previewCustomizeNonce, // for Customize Preview
- wp_customize: 'on'
- };
- if ( ! settings.theme.active ) {
- data.theme = settings.theme.stylesheet;
- }
- data[ settings.renderQueryVar ] = '1';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( shouldSend ) {
+ customized[ id ] = value;
+ }
+ } );
+ data.customized = JSON.stringify( customized );
+ data[ settings.renderNoncePostKey ] = settings.renderNonceValue;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Gather settings to send in partial refresh request.
- customized = {};
- api.each( function( setting, id ) {
- var value = setting.get(), shouldSend = false;
- // @todo Core should propagate the dirty state into the Preview as well so we can use that here.
</del><ins style="background-color: #dfd; 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ container.addClass( 'customize-partial-refreshing' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Send setting if it is the setting for this menu.
- shouldSend = shouldSend || id === 'nav_menu[' + String( menuId ) + ']';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ request = wp.ajax.send( null, {
+ data: data,
+ url: settings.requestUri
+ } );
+ request.done( function( data ) {
+ // If the menu is now not visible, refresh since the page layout may have changed.
+ if ( false === data ) {
+ api.preview.send( 'refresh' );
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var eventParam, previousContainer = container;
+ container = $( data );
+ container.addClass( containerInstanceClassName );
+ container.addClass( 'partial-refreshable-nav-menu customize-partial-refreshing' );
+ previousContainer.replaceWith( container );
+ eventParam = {
+ instanceNumber: instanceNumber,
+ wpNavArgs: wpNavArgs,
+ oldContainer: previousContainer,
+ newContainer: container
+ };
+ container.removeClass( 'customize-partial-refreshing' );
+ $( document ).trigger( 'customize-preview-menu-refreshed', [ eventParam ] );
+ } );
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( shouldSend ) {
- customized[ id ] = value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ refreshMenuInstanceDebounced : function( instanceNumber ) {
+ if ( currentRefreshDebounced[ instanceNumber ] ) {
+ clearTimeout( currentRefreshDebounced[ instanceNumber ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
- data.customized = JSON.stringify( customized );
- data[ settings.renderNoncePostKey ] = settings.renderNonceValue;
-
- wpNavArgs = $.extend( {}, instance );
- data.wp_nav_menu_args_hash = wpNavArgs.args_hash;
- delete wpNavArgs.args_hash;
- data.wp_nav_menu_args = JSON.stringify( wpNavArgs );
-
- container.addClass( 'customize-partial-refreshing' );
-
- request = wp.ajax.send( null, {
- data: data,
- url: settings.requestUri
- } );
- request.done( function( data ) {
- // If the menu is now not visible, refresh since the page layout may have changed.
- if ( false === data ) {
- api.preview.send( 'refresh' );
- return;
- }
-
- var eventParam, previousContainer = container;
- container = $( data );
- container.addClass( containerInstanceClassName );
- container.addClass( 'partial-refreshable-nav-menu customize-partial-refreshing' );
- previousContainer.replaceWith( container );
- eventParam = {
- instanceNumber: instanceNumber,
- wpNavArgs: wpNavArgs,
- oldContainer: previousContainer,
- newContainer: container
- };
- container.removeClass( 'customize-partial-refreshing' );
- $( document ).trigger( 'customize-preview-menu-refreshed', [ eventParam ] );
- } );
- };
-
- self.refreshMenuInstanceDebounced = function( instanceNumber ) {
- if ( currentRefreshDebounced[ instanceNumber ] ) {
- clearTimeout( currentRefreshDebounced[ instanceNumber ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentRefreshDebounced[ instanceNumber ] = setTimeout(
+ _.bind( function() {
+ this.refreshMenuInstance( instanceNumber );
+ }, this ),
+ refreshDebounceDelay
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currentRefreshDebounced[ instanceNumber ] = setTimeout(
- function() {
- self.refreshMenuInstance( instanceNumber );
- },
- refreshDebounceDelay
- );
</del><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">- return self;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.bind( 'preview-ready', function() {
+ api.preview.bind( 'active', function() {
+ api.MenusCustomizerPreview.init();
+ } );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}( jQuery, wp.customize ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}( jQuery, _, wp ) );
</ins></span></pre>
</div>
</div>
</body>
</html>