<!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>[36991] trunk/src/wp-includes: wpLink: fix accessibility issues:</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/36991">36991</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/36991","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-14 20:54:58 +0000 (Mon, 14 Mar 2016)</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'>wpLink: fix accessibility issues:
- Add role=dialog and an aria-labelledby attribute to the modal container.
- Change the modal title to h1.
- Remove one `&nbsp;` that gets read out as `blank` by screen readers.
- Replace the Cancel link with a button.
- Clean up unused CSS.

Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/30468">#30468</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesjswplinkjs">trunk/src/wp-includes/js/wplink.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></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-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2016-03-14 19:16:09 UTC (rev 36990)
+++ trunk/src/wp-includes/class-wp-editor.php   2016-03-14 20:54:58 UTC (rev 36991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1403,13 +1403,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // display: none is required here, see #WP27605
</span><span class="cx" style="display: block; padding: 0 10px">                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                <div id="wp-link-backdrop" style="display: none"></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div id="wp-link-wrap" class="wp-core-ui" style="display: none">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">
</ins><span class="cx" style="display: block; padding: 0 10px">                 <form id="wp-link" tabindex="-1">
</span><span class="cx" style="display: block; padding: 0 10px">                <?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div id="link-modal-title">
-                       <?php _e( 'Insert/edit link' ) ?>
-                       <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-               </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <h1 id="link-modal-title"><?php _e( 'Insert/edit link' ) ?></h1>
+               <button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <div id="link-selector">
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="link-options">
</span><span class="cx" style="display: block; padding: 0 10px">                                <div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1421,14 +1419,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <input id="wp-link-text" type="text" /></label>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="link-target">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <label><span>&nbsp;</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <label><span></span>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><span class="cx" style="display: block; padding: 0 10px">                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="submitbox">
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="wp-link-cancel">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <button type="button" class="button"><?php _e( 'Cancel' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="wp-link-update">
</span><span class="cx" style="display: block; padding: 0 10px">                                <input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
</span></span></pre></div>
<a id="trunksrcwpincludescsseditorcss"></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/css/editor.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/editor.css      2016-03-14 19:16:09 UTC (rev 36990)
+++ trunk/src/wp-includes/css/editor.css        2016-03-14 20:54:58 UTC (rev 36991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1074,7 +1074,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 10px;
</span><span class="cx" style="display: block; padding: 0 10px">        margin: 1px 0 0;
</span><span class="cx" style="display: block; padding: 0 10px">        line-height: 150%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        border: 0 none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border: 0;
</ins><span class="cx" style="display: block; padding: 0 10px">         outline: none;
</span><span class="cx" style="display: block; padding: 0 10px">        display: block;
</span><span class="cx" style="display: block; padding: 0 10px">        resize: vertical;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1388,10 +1388,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        font-size: 18px;
</span><span class="cx" style="display: block; padding: 0 10px">        font-weight: 600;
</span><span class="cx" style="display: block; padding: 0 10px">        line-height: 36px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        margin: 0;
</ins><span class="cx" style="display: block; padding: 0 10px">         padding: 0 36px 0 16px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        top: 0;
-       right: 0;
-       left: 0;
</del><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"> #wp-link-close {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1438,10 +1436,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 0 16px 50px;
</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">-#wp-link-wrap.search-panel-visible #link-selector {
-       -webkit-overflow-scrolling: touch;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #wp-link ol,
</span><span class="cx" style="display: block; padding: 0 10px"> #wp-link ul {
</span><span class="cx" style="display: block; padding: 0 10px">        list-style: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1494,61 +1488,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        max-width: 70%;
</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">-#wp-link li {
-       clear: both;
-       margin-bottom: 0;
-       border-bottom: 1px solid #f1f1f1;
-       color: #32373c;
-       padding: 4px 6px 4px 10px;
-       cursor: pointer;
-       position: relative;
-}
-
-#wp-link li:hover {
-       background: #eaf2fa;
-       color: #151515;
-}
-
-#wp-link li.unselectable {
-       border-bottom: 1px solid #ddd;
-}
-
-#wp-link li.unselectable:hover {
-       background: #fff;
-       cursor: auto;
-       color: #32373c;
-}
-
-#wp-link li.selected {
-       background: #ddd;
-       color: #32373c;
-}
-
-#wp-link li.selected .item-title {
-       font-weight: bold;
-}
-
-#wp-link li:last-child {
-       border: none;
-}
-
-#wp-link .item-title {
-       display: inline-block;
-       width: 80%;
-       width: -webkit-calc(100% - 68px);
-       width: calc(100% - 68px);
-       word-wrap: break-word;
-}
-
-#wp-link .item-info {
-       text-transform: uppercase;
-       color: #666;
-       font-size: 11px;
-       position: absolute;
-       right: 5px;
-       top: 5px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #wp-link .submitbox {
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 8px 16px;
</span><span class="cx" style="display: block; padding: 0 10px">        background: #fcfcfc;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1571,7 +1510,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> #wp-link-submit {
</span><span class="cx" style="display: block; padding: 0 10px">        float: right;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        margin-bottom: 0;
</del><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"> @media screen and ( max-width: 782px ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1583,13 +1521,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                padding: 0 16px 60px;
</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">-        #wp-link-wrap.search-panel-visible #link-selector {
-               bottom: 52px;
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         #wp-link-cancel {
</span><span class="cx" style="display: block; padding: 0 10px">                line-height: 32px;
</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-link .link-target {
+               padding-top: 10px;
+       }
+
+       #wp-link .submitbox .button {
+               margin-bottom: 0;
+       }
</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"> @media screen and ( max-width: 520px ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjswplinkjs"></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/js/wplink.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wplink.js        2016-03-14 19:16:09 UTC (rev 36990)
+++ trunk/src/wp-includes/js/wplink.js  2016-03-14 20:54:58 UTC (rev 36991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.update();
</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">-                        inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel button' ).click( function( event ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">                                wpLink.close();
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span></span></pre>
</div>
</div>

</body>
</html>