<!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>[32844] trunk/src/wp-admin: Semanticize Help and Screen Options toggle.</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/32844">32844</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/32844","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-18 16:35:12 +0000 (Thu, 18 Jun 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'>Semanticize Help and Screen Options toggle.
Links used as UI controls that are not real links but act as buttons, should be buttons.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/32494">#32494</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-06-18 15:50:42 UTC (rev 32843)
+++ trunk/src/wp-admin/css/common.css 2015-06-18 16:35:12 UTC (rev 32844)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,14 +1443,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 20px 0 0;
</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">-#screen-meta-links a {
- padding: 3px 6px 3px 16px;
-}
-
-#screen-meta-links a:focus {
- outline: none;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* screen options and help tabs revert */
</span><span class="cx" style="display: block; padding: 0 10px"> #screen-meta {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1480,26 +1472,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: 0;
</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">-#screen-meta-links a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#screen-meta-links .show-settings {
+ border: 0;
+ background: none;
+ border-radius: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #777;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ line-height: 1.7;
+ padding: 3px 6px 3px 16px;
</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">-#screen-meta-links a:hover,
-#screen-meta-links a:active,
-#screen-meta-links a:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#screen-meta-links .show-settings:hover,
+#screen-meta-links .show-settings:active,
+#screen-meta-links .show-settings:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #32373c;
</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">-#screen-meta-links a.show-settings {
- display: block;
- font-size: 13px;
- height: 22px;
- line-height: 22px;
- text-decoration: none;
- z-index: 1;
-}
-
-#screen-meta-links a:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#screen-meta-links .show-settings:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> right: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> content: '\f140';
</span><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 'dashicons';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1515,13 +1503,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #b4b9be;
</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">-#screen-meta-links a.screen-meta-active:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#screen-meta-links .screen-meta-active: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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#screen-meta-links a.show-settings:hover {
- text-decoration: none;
-}
</del><span class="cx" style="display: block; padding: 0 10px"> /* end screen options and help tabs */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .toggle-arrow {
</span></span></pre></div>
<a id="trunksrcwpadminincludesscreenphp"></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/screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/screen.php 2015-06-18 15:50:42 UTC (rev 32843)
+++ trunk/src/wp-admin/includes/screen.php 2015-06-18 16:35:12 UTC (rev 32844)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,12 +974,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="screen-meta-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $this->get_help_tabs() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#contextual-help-wrap" id="contextual-help-link" class="show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->show_screen_options() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#screen-options-wrap" id="show-settings-link" class="show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></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/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2015-06-18 15:50:42 UTC (rev 32843)
+++ trunk/src/wp-admin/js/common.js 2015-06-18 16:35:12 UTC (rev 32844)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,15 +105,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.element = $('#screen-meta');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.toggles = $('.screen-meta-toggle a');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.toggles = $( '#screen-meta-links' ).find( '.show-settings' );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.page = $('#wpcontent');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.toggles.click( this.toggleEvent );
</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">- toggleEvent: function( e ) {
- var panel = $( this.href.replace(/.+#/, '#') );
- e.preventDefault();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toggleEvent: function() {
+ var panel = $( '#' + $( this ).attr( 'aria-controls' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !panel.length )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,22 +123,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> screenMeta.open( panel, $(this) );
</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">- open: function( panel, link ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ open: function( panel, button ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.screen-meta-toggle').not( link.parent() ).css('visibility', 'hidden');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#screen-meta-links' ).find( '.screen-meta-toggle' ).not( button.parent() ).css( 'visibility', 'hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> panel.parent().show();
</span><span class="cx" style="display: block; padding: 0 10px"> panel.slideDown( 'fast', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> panel.focus();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- link.addClass('screen-meta-active').attr('aria-expanded', true);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', 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"> $( document ).trigger( 'screen:options:open' );
</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">- close: function( panel, link ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ close: function( panel, button ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> panel.slideUp( 'fast', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- link.removeClass('screen-meta-active').attr('aria-expanded', false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ button.removeClass( 'screen-meta-active' ).attr( 'aria-expanded', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $('.screen-meta-toggle').css('visibility', '');
</span><span class="cx" style="display: block; padding: 0 10px"> panel.parent().hide();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre>
</div>
</div>
</body>
</html>