<!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>[33429] trunk/src/wp-includes: TinyMCE: fix accessibility for the keyboard shortcuts help dialog.</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/33429">33429</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/33429","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>2015-07-26 19:13:28 +0000 (Sun, 26 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'>TinyMCE: fix accessibility for the keyboard shortcuts help dialog.
Props afercia, azaozz. Fixes <a href="https://core.trac.wordpress.org/ticket/33031">#33031</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-07-26 18:17:37 UTC (rev 33428)
+++ trunk/src/wp-includes/css/editor.css 2015-07-26 19:13:28 UTC (rev 33429)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,46 +121,41 @@
</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"> .mce-window .wp-editor-help {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 440px;
- padding: 10px 15px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 10px 10px 0 20px;
</ins><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">+.mce-window .wp-editor-help h2,
</ins><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-editor-help p {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 8px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> white-space: normal;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ font-size: 14px;
+ font-weight: normal;
</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"> .mce-window .wp-editor-help table {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 420px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 100%;
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 20px;
</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"> .mce-window .wp-editor-help td,
</span><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-editor-help th {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 13px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 5px;
</ins><span class="cx" style="display: block; padding: 0 10px"> vertical-align: middle;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
-
-.mce-window .wp-editor-help td {
- padding: 5px;
</del><span class="cx" style="display: block; padding: 0 10px"> word-wrap: break-word;
</span><span class="cx" style="display: block; padding: 0 10px"> white-space: normal;
</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"> .mce-window .wp-editor-help th {
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 5px 0 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding-bottom: 0;
</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">-.mce-window .wp-editor-help .wp-help-th-center th {
- text-align: center;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .mce-window .wp-editor-help kbd {
</span><span class="cx" style="display: block; padding: 0 10px"> font-family: monospace;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 2px 7px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 2px 7px 3px;
</ins><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 1px;
</del><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"> background: #eaeaea;
</span><span class="cx" style="display: block; padding: 0 10px"> background: rgba(0,0,0,0.08);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +165,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0 5px;
</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">-.mce-window .wp-help-header td:nth-child(odd) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.mce-window .wp-help-th-center td:nth-child(odd),
+.mce-window .wp-help-th-center th:nth-child(odd) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</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="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></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/tinymce/plugins/wordpress/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-07-26 18:17:37 UTC (rev 33428)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2015-07-26 19:13:28 UTC (rev 33429)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> meta = tinymce.Env.mac ? __( 'Cmd + letter:' ) : __( 'Ctrl + letter:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> table1 = [],
</span><span class="cx" style="display: block; padding: 0 10px"> table2 = [],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header, html;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header, html, dialog, $wrap;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> each( [
</span><span class="cx" style="display: block; padding: 0 10px"> { c: 'Copy', x: 'Cut' },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,9 +238,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> each( row, function( text, key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- out += '<th></th><td></td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ out += '<td></td><td></td>';
</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">- out += '<th><kbd>' + key + '</kbd></th><td>' + __( text ) + '</td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ out += '<td><kbd>' + key + '</kbd></td><td>' + __( text ) + '</td>';
</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">@@ -248,18 +248,18 @@
</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"> header = [ __( 'Letter' ), __( 'Action' ), __( 'Letter' ), __( 'Action' ) ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header = '<tr class="wp-help-header"><td>' + header.join( '</td><td>' ) + '</td></tr>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header = '<tr><th>' + header.join( '</th><th>' ) + '</th></tr>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> html = '<div class="wp-editor-help">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Main section, default and additional shortcuts
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' + __( 'Default shortcuts,' ) + ' ' + meta + '</p>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h2>' + __( 'Default shortcuts,' ) + ' ' + meta + '</h2>' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<table class="wp-help-th-center">' +
</span><span class="cx" style="display: block; padding: 0 10px"> header +
</span><span class="cx" style="display: block; padding: 0 10px"> table1.join('') +
</span><span class="cx" style="display: block; padding: 0 10px"> '</table>' +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' + __( 'Additional shortcuts,' ) + ' ' + access + '</p>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h2>' + __( 'Additional shortcuts,' ) + ' ' + access + '</h2>' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<table class="wp-help-th-center">' +
</span><span class="cx" style="display: block; padding: 0 10px"> header +
</span><span class="cx" style="display: block; padding: 0 10px"> table2.join('') +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( editor.plugins.wptextpattern ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Text pattern section
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</p>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h2>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</h2>' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<table>' +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '*</kbd> <kbd>-': 'Bullet list' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ '1.</kbd> <kbd>1)': 'Numbered list' }) +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Focus management section
</span><span class="cx" style="display: block; padding: 0 10px"> html = html +
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' + __( 'Focus shortcuts:' ) + '</p>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h2>' + __( 'Focus shortcuts:' ) + '</h2>' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<table>' +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ 'Alt + F8': 'Inline toolbar (when an image, link or preview is selected)' }) +
</span><span class="cx" style="display: block; padding: 0 10px"> tr({ 'Alt + F9': 'Editor menu (when enabled)' }) +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> html += '</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.windowManager.open( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dialog = editor.windowManager.open( {
</ins><span class="cx" style="display: block; padding: 0 10px"> title: 'Keyboard Shortcuts',
</span><span class="cx" style="display: block; padding: 0 10px"> items: {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'container',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,6 +306,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> onclick: 'close'
</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">+
+ if ( dialog.$el ) {
+ dialog.$el.find( 'div[role="application"]' ).attr( 'role', 'document' );
+ $wrap = dialog.$el.find( '.mce-wp-help' );
+
+ if ( $wrap[0] ) {
+ $wrap.attr( 'tabindex', '0' ).attr( 'role', 'tab' );
+ $wrap[0].focus();
+ $wrap.on( 'keydown', function( event ) {
+ // Prevent use of: page up, page down, end, home, left arrow, up arrow, right arrow, down arrow
+ // in the dialog keydown handler.
+ if ( event.keyCode >= 33 && event.keyCode <= 40 ) {
+ event.stopPropagation();
+ }
+ });
+ }
+ }
</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"> editor.addCommand( 'WP_Medialib', function() {
</span></span></pre>
</div>
</div>
</body>
</html>