<!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>[46250] trunk/src: Accessibility: Make sortable meta boxes non sortable when there are no locations they can be dragged to.</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/46250">46250</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/46250","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-23 17:29:46 +0000 (Mon, 23 Sep 2019)</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'>Accessibility: Make sortable meta boxes non sortable when there are no locations they can be dragged to.
Depending on the amount of meta boxes and the layout settings under Screen Options, sortable meta boxes may not be actually sortable.
In these cases, jQuery UI sortable needs to be disabled and the user interface shouldn't use a CSS `cursor: move`.
The use of consistent and relevant cursors may be important for users who have a cognitive disability, since cursors give a visual clue as to an element's functionality. Using the move cursor for elements which cannot be moved may be confusing or counter-intuitive for users.
Props adamsilverstein, antpb, anevins.
Fixes <a href="https://core.trac.wordpress.org/ticket/47131">#47131</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmincommonjs">trunk/src/js/_enqueues/admin/common.js</a></li>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmincommonjs"></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/admin/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/common.js 2019-09-23 17:24:58 UTC (rev 46249)
+++ trunk/src/js/_enqueues/admin/common.js 2019-09-23 17:29:46 UTC (rev 46250)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1274,6 +1274,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.maybeDisableSortables = this.maybeDisableSortables.bind( this );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Modify functionality based on custom activate/deactivate event
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-responsive-activate.wp-responsive', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.activate();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1313,16 +1315,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-window-resized.wp-responsive', $.proxy( this.trigger, this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This needs to run later as UI Sortable may be initialized later on $(document).ready().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $window.on( 'load.wp-responsive', function() {
- var width = navigator.userAgent.indexOf('AppleWebKit/') > -1 ? $window.width() : window.innerWidth;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $window.on( 'load.wp-responsive', this.maybeDisableSortables );
+ $document.on( 'postbox-toggled', this.maybeDisableSortables );
</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 ( width <= 782 ) {
- self.disableSortables();
- }
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When the screen columns are changed, potentially disable sortables.
+ $( '#screen-options-wrap input' ).on( 'click', this.maybeDisableSortables );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Disable sortables if there is only one metabox, or the screen is in one column mode. Otherwise, enable sortables.
+ *
+ * @since 5.3.0
+ *
+ * @returns {void}
+ */
+ maybeDisableSortables: function() {
+ var width = navigator.userAgent.indexOf('AppleWebKit/') > -1 ? $window.width() : window.innerWidth;
+
+ if (
+ ( width <= 782 ) ||
+ ( 1 >= $sortables.find( '.ui-sortable-handle:visible' ).length && jQuery( '.columns-prefs-1 input' ).prop( 'checked' ) )
+ ) {
+ this.disableSortables();
+ } else {
+ this.enableSortables();
+ }
+ },
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Changes properties of body and admin menu.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Pins and unpins the menu and adds the auto-fold class to the body.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1356,7 +1376,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deactivate: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><span class="cx" style="display: block; padding: 0 10px"> $adminmenu.removeData('wp-responsive');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.enableSortables();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.maybeDisableSortables();
</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">@@ -1391,6 +1412,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.disableOverlay();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.maybeDisableSortables();
</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">@@ -1439,6 +1462,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $sortables.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $sortables.sortable( 'disable' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sortables.find( '.ui-sortable-handle' ).addClass( 'is-non-sortable' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } catch ( e ) {}
</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">@@ -1454,6 +1478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $sortables.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $sortables.sortable( 'enable' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sortables.find( '.ui-sortable-handle' ).removeClass( 'is-non-sortable' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } catch ( e ) {}
</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="trunksrcwpadmincsscommoncss"></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/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2019-09-23 17:24:58 UTC (rev 46249)
+++ trunk/src/wp-admin/css/common.css 2019-09-23 17:29:46 UTC (rev 46250)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,6 +2041,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: move;
</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">+.js .widget .widget-top.is-non-sortable,
+.js .postbox .hndle.is-non-sortable {
+ cursor: auto;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .hndle a {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 400;
</span></span></pre>
</div>
</div>
</body>
</html>