<!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>[51010] trunk/src: Coding Standards: Further update the code for bulk menu items deletion to better follow WordPress coding standards.</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 { white-space: pre-line; 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/51010">51010</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/51010","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-25 19:13:38 +0000 (Tue, 25 May 2021)</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'>Coding Standards: Further update the code for bulk menu items deletion to better follow WordPress coding standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51006">[51006]</a>, <a href="https://core.trac.wordpress.org/changeset/51009">[51009]</a>.
See <a href="https://core.trac.wordpress.org/ticket/21603">#21603</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibnavmenujs">trunk/src/js/_enqueues/lib/nav-menu.js</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibnavmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/nav-menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/nav-menu.js 2021-05-25 18:52:28 UTC (rev 51009)
+++ trunk/src/js/_enqueues/lib/nav-menu.js 2021-05-25 19:13:38 UTC (rev 51010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,12 +875,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> attachBulkSelectButtonListeners : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.bulk-select-switcher').on( 'change', function(){
- if( this.checked ){
- $('.bulk-select-switcher').prop('checked',true);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.bulk-select-switcher' ).on( 'change', function() {
+ if ( this.checked ) {
+ $( '.bulk-select-switcher' ).prop( 'checked', true );
</ins><span class="cx" style="display: block; padding: 0 10px"> that.enableBulkSelection();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }else{
- $('.bulk-select-switcher').prop('checked',false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $( '.bulk-select-switcher' ).prop( 'checked', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> that.disableBulkSelection();
</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">@@ -892,13 +892,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> enableBulkSelection : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#menu-to-edit').addClass('bulk-selection');
- $('#nav-menu-bulk-actions-top').addClass('bulk-selection');
- $('#nav-menu-bulk-actions-bottom').addClass('bulk-selection');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var checkbox = $( '#menu-to-edit .menu-item-checkbox' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var checkbox = $('#menu-to-edit .menu-item-checkbox');
- $.each( checkbox, function(){
- $(this).prop('disabled',false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#menu-to-edit' ).addClass( 'bulk-selection' );
+ $( '#nav-menu-bulk-actions-top' ).addClass( 'bulk-selection' );
+ $( '#nav-menu-bulk-actions-bottom' ).addClass( 'bulk-selection' );
+
+ $.each( checkbox, function() {
+ $(this).prop( 'disabled', 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,20 +909,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> disableBulkSelection : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#menu-to-edit').removeClass('bulk-selection');
- $('#nav-menu-bulk-actions-top').removeClass('bulk-selection');
- $('#nav-menu-bulk-actions-bottom').removeClass('bulk-selection');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var checkbox = $( '#menu-to-edit .menu-item-checkbox' );
</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 ( $('.menu-items-delete').is('[aria-describedby="pending-menu-items-to-delete"]') ) {
- $('.menu-items-delete').removeAttr( 'aria-describedby' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#menu-to-edit' ).removeClass( 'bulk-selection' );
+ $( '#nav-menu-bulk-actions-top' ).removeClass( 'bulk-selection' );
+ $( '#nav-menu-bulk-actions-bottom' ).removeClass( 'bulk-selection' );
+
+ if ( $( '.menu-items-delete' ).is( '[aria-describedby="pending-menu-items-to-delete"]' ) ) {
+ $( '.menu-items-delete' ).removeAttr( 'aria-describedby' );
</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">- var checkbox = $('#menu-to-edit .menu-item-checkbox');
- $.each( checkbox, function(){
- $(this).prop('disabled',true).prop('checked',false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( checkbox, function() {
+ $(this).prop( 'disabled', true ).prop( 'checked', 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">- $('.menu-items-delete').addClass('disabled');
- $('#pending-menu-items-to-delete ul').empty();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $( '.menu-items-delete' ).addClass( 'disabled' );
+ $( '#pending-menu-items-to-delete ul' ).empty();
</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">@@ -932,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> attachMenuCheckBoxListeners : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#menu-to-edit' ).on( 'change', '.menu-item-checkbox', function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#menu-to-edit' ).on( 'change', '.menu-item-checkbox', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> that.setRemoveSelectedButtonStatus();
</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">@@ -945,30 +948,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> attachMenuItemDeleteButton : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( document ).on('click', '.menu-items-delete', function(e){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( document ).on( 'click', '.menu-items-delete', function( e ) {
+ var itemsPendingDeletion, itemsPendingDeletionList, deletionSpeech;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</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( ! $(this).hasClass('disabled') ){
- $.each( $('.menu-item-checkbox:checked'), function( index, element ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $(this).hasClass( 'disabled' ) ) {
+ $.each( $( '.menu-item-checkbox:checked' ), function( index, element ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( element ).parents( 'li' ).find( 'a.item-delete' ).trigger( 'click' );
</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">- $('.menu-items-delete').addClass('disabled');
- $('.bulk-select-switcher').prop('checked',false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.menu-items-delete' ).addClass( 'disabled' );
+ $( '.bulk-select-switcher' ).prop( 'checked', 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">- var itemsPendingDeletion = '';
- var itemsPendingDeletionList = $('#pending-menu-items-to-delete ul li');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ itemsPendingDeletion = '';
+ itemsPendingDeletionList = $( '#pending-menu-items-to-delete ul li' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( itemsPendingDeletionList, function( index, element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var itemName = $( element ).find( '.pending-menu-item-name' ).text();
</span><span class="cx" style="display: block; padding: 0 10px"> var itemSpeech = menus.menuItemDeletion.replace( '%s', itemName );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- itemsPendingDeletion += itemSpeech ;
- if( ( index + 1 ) < itemsPendingDeletionList.length ){
- itemsPendingDeletion += ', ' ;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ itemsPendingDeletion += itemSpeech;
+ if ( ( index + 1 ) < itemsPendingDeletionList.length ) {
+ itemsPendingDeletion += ', ';
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var deletionSpeech = menus.itemsDeleted.replace( '%s', itemsPendingDeletion );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deletionSpeech = menus.itemsDeleted.replace( '%s', itemsPendingDeletion );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.a11y.speak( deletionSpeech, 'polite' );
</span><span class="cx" style="display: block; padding: 0 10px"> that.disableBulkSelection();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -980,25 +986,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attachPendingMenuItemsListForDeletion : function(){
- $('#post-body-content').on( 'change', '.menu-item-checkbox', function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attachPendingMenuItemsListForDeletion : function() {
+ $( '#post-body-content' ).on( 'change', '.menu-item-checkbox', function() {
+ var menuItemName, menuItemType, menuItemID, listedMenuItem;
</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( ! $('.menu-items-delete').is('[aria-describedby="pending-menu-items-to-delete"]') ){ $('.menu-items-delete').attr( 'aria-describedby', 'pending-menu-items-to-delete' ); }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $( '.menu-items-delete' ).is( '[aria-describedby="pending-menu-items-to-delete"]' ) ) {
+ $( '.menu-items-delete' ).attr( 'aria-describedby', 'pending-menu-items-to-delete' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var menuItemName = $(this).next().text();
- var menuItemType = $(this).parent().next('.item-controls').find('.item-type').text();
- var menuItemID = $(this).attr('data-menu-item-id');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuItemName = $(this).next().text();
+ menuItemType = $(this).parent().next( '.item-controls' ).find( '.item-type' ).text();
+ menuItemID = $(this).attr( 'data-menu-item-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">- var ListedMenuItem = $('#pending-menu-items-to-delete ul').find('[data-menu-item-id=' + menuItemID + ']');
- if( ListedMenuItem.length > 0 ){
- ListedMenuItem.remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ listedMenuItem = $( '#pending-menu-items-to-delete ul' ).find( '[data-menu-item-id=' + menuItemID + ']' );
+ if ( listedMenuItem.length > 0 ) {
+ listedMenuItem.remove();
</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( this.checked === true ){
- $('#pending-menu-items-to-delete ul').append( '<li data-menu-item-id="' + menuItemID + '"><span class="pending-menu-item-name">' + menuItemName + '</span> <span class="pending-menu-item-type">(' + menuItemType + ')</span><span class="separator"></span></li>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( this.checked === true ) {
+ $( '#pending-menu-items-to-delete ul' ).append(
+ '<li data-menu-item-id="' + menuItemID + '">' +
+ '<span class="pending-menu-item-name">' + menuItemName + '</span> ' +
+ '<span class="pending-menu-item-type">(' + menuItemType + ')</span>' +
+ '<span class="separator"></span>' +
+ '</li>'
+ );
</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">- $('#pending-menu-items-to-delete li .separator').html(', ');
- $('#pending-menu-items-to-delete li .separator').last().html('.');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#pending-menu-items-to-delete li .separator' ).html( ', ' );
+ $( '#pending-menu-items-to-delete li .separator' ).last().html( '.' );
</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">@@ -1007,21 +1023,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setBulkDeleteCheckboxStatus : function(){
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setBulkDeleteCheckboxStatus : function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var checkbox = $('#menu-to-edit .menu-item-checkbox');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var checkbox = $( '#menu-to-edit .menu-item-checkbox' );
</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( checkbox, function(){
-
- if( $(this).prop('disabled') == true ){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( checkbox, function() {
+ if ( $(this).prop( 'disabled' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $(this).prop( 'disabled', false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }else{
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $(this).prop( 'disabled', true );
</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">- if( $(this).is(':checked')) {
- $(this).prop('checked',false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $(this).is( ':checked' ) ) {
+ $(this).prop( 'checked', 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,14 +1047,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setRemoveSelectedButtonStatus : function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setRemoveSelectedButtonStatus : function() {
+ var button = $( '.menu-items-delete' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var button = $('.menu-items-delete');
-
- if( $('.menu-item-checkbox:checked').length > 0 ) {
- button.removeClass('disabled');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $( '.menu-item-checkbox:checked' ).length > 0 ) {
+ button.removeClass( 'disabled' );
</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">- button.addClass('disabled');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ button.addClass( 'disabled' );
</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></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></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/includes/class-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2021-05-25 18:52:28 UTC (rev 51009)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2021-05-25 19:13:38 UTC (rev 51010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode( ' ', $classes ); ?>">
</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">- <label class="item-title" for="menu-item-checkbox-<?php echo $item_id; ?>"><input id="menu-item-checkbox-<?php echo $item_id; ?>" type="checkbox" class="menu-item-checkbox" data-menu-item-id="<?php echo $item_id; ?>" disabled="disabled"/><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="item-title" for="menu-item-checkbox-<?php echo $item_id; ?>">
+ <input id="menu-item-checkbox-<?php echo $item_id; ?>" type="checkbox" class="menu-item-checkbox" data-menu-item-id="<?php echo $item_id; ?>" disabled="disabled" />
+ <span class="menu-item-title"><?php echo esc_html( $title ); ?></span>
+ <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="item-controls">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="item-order hide-if-js">
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2021-05-25 18:52:28 UTC (rev 51009)
+++ trunk/src/wp-admin/nav-menus.php 2021-05-25 19:13:38 UTC (rev 51010)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,7 +984,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menu-bulk-actions-top" class="bulk-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="bulk-select-button" for="bulk-select-switcher-top">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="bulk-select-switcher-top" name="bulk-select-switcher-top" class="bulk-select-switcher">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bulk-select-button-label"><?php echo __( 'Bulk Select' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,7 +1015,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menu-bulk-actions-bottom" class="bulk-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="bulk-select-button" for="bulk-select-switcher-bottom">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="bulk-select-switcher-bottom" name="bulk-select-switcher-top" class="bulk-select-switcher">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bulk-select-button-label"><?php echo __( 'Bulk Select' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="button" class="deletion menu-items-delete disabled" value="<?php _e( 'Remove Selected Items' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="pending-menu-items-to-delete">
</span></span></pre>
</div>
</div>
</body>
</html>