<!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>[33413] trunk/src: Customizer: Add missing text or labels to some nav menu UI controls.</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/33413">33413</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/33413","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-24 20:27:04 +0000 (Fri, 24 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: Add missing text or labels to some nav menu UI controls.
props afercia, celloexpressions, westonruter.
fixes <a href="https://core.trac.wordpress.org/ticket/32715">#32715</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizenavmenuscss">trunk/src/wp-admin/css/customize-nav-menus.css</a></li>
<li><a href="#trunksrcwpadminjsaccordionjs">trunk/src/wp-admin/js/accordion.js</a></li>
<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="trunksrcwpadmincsscustomizenavmenuscss"></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/css/customize-nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-nav-menus.css 2015-07-24 17:56:50 UTC (rev 33412)
+++ trunk/src/wp-admin/css/customize-nav-menus.css 2015-07-24 20:27:04 UTC (rev 33413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: #eee;
</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">-#available-menu-items .open .accordion-section-title:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* rework the arrow indicator implementation for NVDA bug see #32715 */
+#available-menu-items .accordion-section-title:after {
+ content: none !important;
+}
+
+#available-menu-items .accordion-section-title .toggle-indicator {
+ display: inline-block;
+ font-size: 20px;
+ line-height: 1;
+}
+
+#available-menu-items .accordion-section-title .toggle-indicator:after {
+ content: '\f140';
+ font: normal 20px/1 'dashicons';
+ color: #a0a5aa;
+ vertical-align: top;
+ speak: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-decoration: none !important;
+}
+
+#available-menu-items .accordion-section-title:hover .toggle-indicator:after {
+ color: #777;
+}
+
+#available-menu-items .open .accordion-section-title .toggle-indicator:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: '\f142';
</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">@@ -645,10 +671,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #available-menu-items .accordion-section-title button {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 28px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: 32px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: 35px;
</ins><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 5px;
</span><span class="cx" style="display: block; padding: 0 10px"> right: 5px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cursor: pointer;
</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"> #available-menu-items .accordion-section-title button:focus {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,10 +684,15 @@
</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"> #available-menu-items .accordion-section-title .no-items,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#available-menu-items .cannot-expand .accordion-section-title .spinner {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#available-menu-items .cannot-expand .accordion-section-title .spinner,
+#available-menu-items .cannot-expand .accordion-section-title > button {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: none;
</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">+#available-menu-items-search.cannot-expand .accordion-section-title .spinner {
+ display: block;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #available-menu-items .cannot-expand .accordion-section-title .no-items {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #777;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #available-menu-items-search .spinner {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- top: 18px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: 20px;
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: 0 !important;
</span><span class="cx" style="display: block; padding: 0 10px"> right: 20px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjsaccordionjs"></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/accordion.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/accordion.js 2015-07-24 17:56:50 UTC (rev 33412)
+++ trunk/src/wp-admin/js/accordion.js 2015-07-24 20:27:04 UTC (rev 33413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function accordionSwitch ( el ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var section = el.closest( '.accordion-section' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sectionToggleControl = section.find( '[aria-expanded]' ).first(),
</ins><span class="cx" style="display: block; padding: 0 10px"> siblings = section.closest( '.accordion-container' ).find( '.open' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ siblingsToggleControl = siblings.find( '[aria-expanded]' ).first(),
</ins><span class="cx" style="display: block; padding: 0 10px"> content = section.find( '.accordion-section-content' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This section has no content and cannot be expanded.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,11 +67,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> section.toggleClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.toggle( true ).slideToggle( 150 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ siblingsToggleControl.attr( 'aria-expanded', 'false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> siblings.removeClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> siblings.find( '.accordion-section-content' ).show().slideUp( 150 );
</span><span class="cx" style="display: block; padding: 0 10px"> content.toggle( false ).slideToggle( 150 );
</span><span class="cx" style="display: block; padding: 0 10px"> section.toggleClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If there's an element with an aria-expanded attribute, assume it's a toggle control and toggle the aria-expanded value.
+ if ( sectionToggleControl ) {
+ sectionToggleControl.attr( 'aria-expanded', String( sectionToggleControl.attr( 'aria-expanded' ) === 'false' ) );
+ }
</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"> })(jQuery);
</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 2015-07-24 17:56:50 UTC (rev 33412)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2015-07-24 20:27:04 UTC (rev 33413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,10 +153,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Load more items.
</span><span class="cx" style="display: block; padding: 0 10px"> this.sectionContent.scroll( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var totalHeight = self.$el.find( '.accordion-section.open .accordion-section-content' ).prop( 'scrollHeight' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- visibleHeight = self.$el.find( '.accordion-section.open' ).height();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ visibleHeight = self.$el.find( '.accordion-section.open' ).height();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! self.loading && $( this ).scrollTop() > 3 / 4 * totalHeight - visibleHeight ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var type = $( this ).data( 'type' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- object = $( this ).data( 'object' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ object = $( this ).data( 'object' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'search' === type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.searchTerm ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self.doSearch( self.pages.search );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,18 +175,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Search input change handler.
</span><span class="cx" style="display: block; padding: 0 10px"> search: function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $searchSection = $( '#available-menu-items-search' ),
+ $openSections = $( '#available-menu-items .accordion-section.open' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! event ) {
</span><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"> // Manual accordion-opening behavior.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this.searchTerm && ! $( '#available-menu-items-search' ).hasClass( 'open' ) ) {
- $( '#available-menu-items .accordion-section-content' ).slideUp( 'fast' );
- $( '#available-menu-items-search .accordion-section-content' ).slideDown( 'fast' );
- $( '#available-menu-items .accordion-section.open' ).removeClass( 'open' );
- $( '#available-menu-items-search' ).addClass( 'open' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.searchTerm && ! $searchSection.hasClass( 'open' ) ) {
+ $openSections.find( '.accordion-section-content' ).slideUp( 'fast' );
+ $searchSection.find( '.accordion-section-content' ).slideDown( 'fast' );
+ $openSections.find( '[aria-expanded]' ).first().attr( 'aria-expanded', 'false' );
+ $openSections.removeClass( 'open' );
+ $searchSection.addClass( 'open' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === event.target.value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#available-menu-items-search' ).removeClass( 'open' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searchSection.removeClass( 'open' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.searchTerm === event.target.value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,9 +203,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get search results.
</span><span class="cx" style="display: block; padding: 0 10px"> doSearch: function( page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this, params,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section = $( '#available-menu-items-search' ),
- $content = $section.find( '.accordion-section-content' ),
- itemTemplate = wp.template( 'available-menu-item' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section = $( '#available-menu-items-search' ),
+ $content = $section.find( '.accordion-section-content' ),
+ itemTemplate = wp.template( 'available-menu-item' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.currentRequest ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self.currentRequest.abort();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,7 +1997,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> toggleReordering: function( showOrHide ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var addNewItemBtn = this.container.find( '.add-new-menu-item' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- reorderBtn = this.container.find( '.reorder-toggle' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ reorderBtn = this.container.find( '.reorder-toggle' ),
+ itemsTitle = this.$sectionContent.find( '.item-title' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> showOrHide = Boolean( showOrHide );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2003,13 +2010,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.$sectionContent.toggleClass( 'reordering', showOrHide );
</span><span class="cx" style="display: block; padding: 0 10px"> this.$sectionContent.sortable( this.isReordering ? 'disable' : 'enable' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.isReordering ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- addNewItemBtn.attr( 'tabindex', '-1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ addNewItemBtn.attr({ 'tabindex': '-1', 'aria-hidden': 'true' });
</ins><span class="cx" style="display: block; padding: 0 10px"> reorderBtn.attr( 'aria-label', api.Menus.data.l10n.reorderLabelOff );
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( api.Menus.data.l10n.reorderModeOn );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ itemsTitle.attr( 'aria-hidden', 'false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- addNewItemBtn.removeAttr( 'tabindex' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ addNewItemBtn.removeAttr( 'tabindex aria-hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px"> reorderBtn.attr( 'aria-label', api.Menus.data.l10n.reorderLabelOn );
</span><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( api.Menus.data.l10n.reorderModeOff );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ itemsTitle.attr( 'aria-hidden', '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"> if ( showOrHide ) {
</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-24 17:56:50 UTC (rev 33412)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-07-24 20:27:04 UTC (rev 33413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1679,14 +1679,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-bar">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-handle">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="item-type">{{ data.item_type_label }}</span>
- <span class="item-title">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="item-type" aria-hidden="true">{{ data.item_type_label }}</span>
+ <span class="item-title" aria-hidden="true">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="menu-item-title<# if ( ! data.title ) { #> no-title<# } #>">{{ data.title || wp.customize.Menus.data.l10n.untitled }}</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="item-controls">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" class="not-a-button item-edit"><span class="screen-reader-text"><?php _e( 'Edit Menu Item' ); ?></span></button>
- <button type="button" class="not-a-button item-delete submitdelete deletion"><span class="screen-reader-text"><?php _e( 'Remove Menu Item' ); ?></span></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="not-a-button item-edit"><span class="screen-reader-text"><?php
+ /* translators: 1: Title of a menu item, 2: Type of a menu item */
+ printf( __( 'Edit menu item: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
+ ?></span></button>
+ <button type="button" class="not-a-button item-delete submitdelete deletion"><span class="screen-reader-text"><?php
+ /* translators: 1: Title of a menu item, 2: Type of a menu item */
+ printf( __( 'Remove Menu Item: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
+ ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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-24 17:56:50 UTC (rev 33412)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-07-24 20:27:04 UTC (rev 33413)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,7 +721,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="accordion-section-content" data-type="search"></ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="new-custom-menu-item" class="accordion-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h4 class="accordion-section-title"><?php _e( 'Custom Links' ); ?><button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4 class="accordion-section-title" role="presentation">
+ <?php _e( 'Custom Links' ); ?>
+ <button type="button" class="not-a-button" aria-expanded="false">
+ <span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ </h4>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="accordion-section-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="menu-item-url-wrap">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,7 +756,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h4 class="accordion-section-title"><?php echo esc_html( $available_item_type['title'] ); ?> <span class="no-items"><?php _e( 'No items' ); ?></span><span class="spinner"></span> <button type="button" class="not-a-button"><span class="screen-reader-text"><?php _e( 'Toggle' ); ?></span></button></h4>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4 class="accordion-section-title" role="presentation">
+ <?php echo esc_html( $available_item_type['title'] ); ?>
+ <span class="spinner"></span>
+ <span class="no-items"><?php _e( 'No items' ); ?></span>
+ <button type="button" class="not-a-button" aria-expanded="false">
+ <span class="screen-reader-text"><?php
+ /* translators: %s: Title of a section with menu items */
+ printf( 'Toggle section: %s', esc_html( $available_item_type['title'] ) ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ </h4>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="accordion-section-content" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>"></ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>