<!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>[33189] trunk/src: Customizer: Disambiguate a menu's auto-add pages option from preceding menu location checkboxes.</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/33189">33189</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/33189","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-13 08:39:17 +0000 (Mon, 13 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: Disambiguate a menu's auto-add pages option from preceding menu location checkboxes.
Creates a separate `nav_menu_auto_add` control type following the pattern of the `nav_menu_name` control type.
Props valendesigns.
Fixes <a href="https://core.trac.wordpress.org/ticket/32820">#32820</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-07-13 03:33:38 UTC (rev 33188)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2015-07-13 08:39:17 UTC (rev 33189)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@
</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"> populateControls: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var section = this, menuNameControlId, menuControl, menuNameControl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var section = this, menuNameControlId, menuAutoAddControlId, menuControl, menuNameControl, menuAutoAddControl;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the control for managing the menu name.
</span><span class="cx" style="display: block; padding: 0 10px"> menuNameControlId = section.id + '[name]';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> menuNameControl = new api.controlConstructor.nav_menu_name( menuNameControlId, {
</span><span class="cx" style="display: block; padding: 0 10px"> params: {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'nav_menu_name',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content: '<li id="customize-control-' + section.id.replace( '[', '-' ).replace( ']', '' ) + '-name" class="customize-control customize-control-nav_menu_name"></li>', // @todo core should do this for us
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content: '<li id="customize-control-' + section.id.replace( '[', '-' ).replace( ']', '' ) + '-name" class="customize-control customize-control-nav_menu_name"></li>', // @todo core should do this for us; see #30741
</ins><span class="cx" style="display: block; padding: 0 10px"> label: '',
</span><span class="cx" style="display: block; padding: 0 10px"> active: true,
</span><span class="cx" style="display: block; padding: 0 10px"> section: section.id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,9 +705,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> menuControl = new api.controlConstructor.nav_menu( section.id, {
</span><span class="cx" style="display: block; padding: 0 10px"> params: {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'nav_menu',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content: '<li id="customize-control-' + section.id.replace( '[', '-' ).replace( ']', '' ) + '" class="customize-control customize-control-nav_menu"></li>', // @todo core should do this for us
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content: '<li id="customize-control-' + section.id.replace( '[', '-' ).replace( ']', '' ) + '" class="customize-control customize-control-nav_menu"></li>', // @todo core should do this for us; see #30741
</ins><span class="cx" style="display: block; padding: 0 10px"> section: section.id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- priority: 999,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ priority: 998,
</ins><span class="cx" style="display: block; padding: 0 10px"> active: true,
</span><span class="cx" style="display: block; padding: 0 10px"> settings: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'default': section.id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,6 +719,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> menuControl.active.set( true );
</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">+ // Add the control for managing the menu auto_add.
+ menuAutoAddControlId = section.id + '[auto_add]';
+ menuAutoAddControl = api.control( menuAutoAddControlId );
+ if ( ! menuAutoAddControl ) {
+ menuAutoAddControl = new api.controlConstructor.nav_menu_auto_add( menuAutoAddControlId, {
+ params: {
+ type: 'nav_menu_auto_add',
+ content: '<li id="customize-control-' + section.id.replace( '[', '-' ).replace( ']', '' ) + '-auto-add" class="customize-control customize-control-nav_menu_auto_add"></li>', // @todo core should do this for us
+ label: '',
+ active: true,
+ section: section.id,
+ priority: 999,
+ settings: {
+ 'default': section.id
+ }
+ }
+ } );
+ api.control.add( menuAutoAddControl.id, menuAutoAddControl );
+ menuAutoAddControl.active.set( true );
+ }
+
</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">@@ -1592,6 +1613,52 @@
</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">+ * wp.customize.Menus.MenuAutoAddControl
+ *
+ * Customizer control for a nav menu's auto add.
+ *
+ * @constructor
+ * @augments wp.customize.Control
+ */
+ api.Menus.MenuAutoAddControl = api.Control.extend({
+
+ ready: function() {
+ var control = this,
+ settingValue = control.setting();
+
+ /*
+ * Since the control is not registered in PHP, we need to prevent the
+ * preview's sending of the activeControls to result in this control
+ * being deactivated.
+ */
+ control.active.validate = function() {
+ return api.section( control.section() ).active();
+ };
+
+ control.autoAddElement = new api.Element( control.container.find( 'input[type=checkbox].auto_add' ) );
+
+ control.autoAddElement.bind(function( value ) {
+ var settingValue = control.setting();
+ if ( settingValue && settingValue.name !== value ) {
+ settingValue = _.clone( settingValue );
+ settingValue.auto_add = value;
+ control.setting.set( settingValue );
+ }
+ });
+ if ( settingValue ) {
+ control.autoAddElement.set( settingValue.auto_add );
+ }
+
+ control.setting.bind(function( object ) {
+ if ( object ) {
+ control.autoAddElement.set( object.auto_add );
+ }
+ });
+ }
+
+ });
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * wp.customize.Menus.MenuControl
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Customizer control for menus.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1662,25 +1729,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var control = this,
</span><span class="cx" style="display: block; padding: 0 10px"> menuId = control.params.menu_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- control.elements = {};
- control.elements.auto_add = new api.Element( control.container.find( 'input[type=checkbox].auto_add' ) );
-
- control.elements.auto_add.bind(function( auto_add ) {
- var settingValue = control.setting();
- if ( settingValue && settingValue.auto_add !== auto_add ) {
- settingValue = _.clone( settingValue );
- settingValue.auto_add = auto_add;
- control.setting.set( settingValue );
- }
- });
- control.elements.auto_add.set( control.setting().auto_add );
- control.setting.bind(function( object ) {
- if ( ! object ) {
- return;
- }
- control.elements.auto_add.set( object.auto_add );
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> control.setting.bind( function( to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var name;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === to ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2244,6 +2292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> nav_menu_item: api.Menus.MenuItemControl,
</span><span class="cx" style="display: block; padding: 0 10px"> nav_menu: api.Menus.MenuControl,
</span><span class="cx" style="display: block; padding: 0 10px"> nav_menu_name: api.Menus.MenuNameControl,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ nav_menu_auto_add: api.Menus.MenuAutoAddControl,
</ins><span class="cx" style="display: block; padding: 0 10px"> new_menu: api.Menus.NewMenuControl
</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="trunksrcwpincludesclasswpcustomizecontrolphp"></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-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2015-07-13 03:33:38 UTC (rev 33188)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-07-13 08:39:17 UTC (rev 33189)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1603,14 +1603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
- <p>
- <label>
- <input type="checkbox" class="auto_add">
- <?php _e( 'Automatically add new top-level pages to this menu' ) ?>
- </label>
- </p>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif;
</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">@@ -1886,6 +1879,45 @@
</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">+ * Customize control to represent the auto_add field for a given menu.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Auto_Add_Control extends WP_Customize_Control {
+
+ /**
+ * Type of control, used by JS.
+ *
+ * @since 4.3.0
+ *
+ * @var string
+ */
+ public $type = 'nav_menu_auto_add';
+
+ /**
+ * No-op since we're using JS template.
+ *
+ * @since 4.3.0
+ */
+ protected function render_content() {}
+
+ /**
+ * Render the Underscore template for this control.
+ *
+ * @since 4.3.0
+ */
+ protected function content_template() {
+ ?>
+ <label>
+ <span class="customize-control-title"><?php _e( 'Menu Options' ); ?></span>
+ <input type="checkbox" class="auto_add" />
+ <?php _e( 'Automatically add new top-level pages to this menu' ); ?>
+ </label>
+ <?php
+ }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Customize control class for new menus.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</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 2015-07-13 03:33:38 UTC (rev 33188)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-07-13 08:39:17 UTC (rev 33189)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,6 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a panel for Menus.
</span></span></pre>
</div>
</div>
</body>
</html>