<!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>[45066] trunk/src: TinyMCE:</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/45066">45066</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/45066","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>2019-03-29 00:48:31 +0000 (Fri, 29 Mar 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'>TinyMCE:
- Fix adding the keyboard shortcuts to all button tooltips in the classic editor and classic block.
- Fix translating the aria labels for all buttons.
Fixes <a href="https://core.trac.wordpress.org/ticket/35710">#35710</a>;</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesvendortinymcepluginswordpresspluginjs">trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesvendortinymcepluginswordpresspluginjs"></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/vendor/tinymce/plugins/wordpress/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js 2019-03-28 22:02:10 UTC (rev 45065)
+++ trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js 2019-03-29 00:48:31 UTC (rev 45066)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __ = editor.editorManager.i18n.translate,
</span><span class="cx" style="display: block; padding: 0 10px"> $ = window.jQuery,
</span><span class="cx" style="display: block; padding: 0 10px"> wp = window.wp,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) ),
+ wpTooltips = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,41 +582,6 @@
</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"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( editor.settings.wp_shortcut_labels && editor.theme.panel ) {
- var labels = {};
- var access = 'Shift+Alt+';
- var meta = 'Ctrl+';
-
- // For Mac: ctrl = \u2303, cmd = \u2318, alt = \u2325
-
- if ( tinymce.Env.mac ) {
- access = '\u2303\u2325';
- meta = '\u2318';
- }
-
- each( editor.settings.wp_shortcut_labels, function( value, name ) {
- labels[ name ] = value.replace( 'access', access ).replace( 'meta', meta );
- } );
-
- each( editor.theme.panel.find('button'), function( button ) {
- if ( button && button.settings.tooltip && labels.hasOwnProperty( button.settings.tooltip ) ) {
- // Need to translate now. We are changing the string so it won't match and cannot be translated later.
- button.settings.tooltip = editor.translate( button.settings.tooltip ) + ' (' + labels[ button.settings.tooltip ] + ')';
- }
- } );
-
- // listbox for the "blocks" drop-down
- each( editor.theme.panel.find('listbox'), function( listbox ) {
- if ( listbox && listbox.settings.text === 'Paragraph' ) {
- each( listbox.settings.values, function( item ) {
- if ( item.text && labels.hasOwnProperty( item.text ) ) {
- item.shortcut = '(' + labels[ item.text ] + ')';
- }
- } );
- }
- } );
- }
</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"> editor.on( 'SaveContent', function( event ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,6 +684,95 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'beforerenderui', function() {
+ if ( editor.theme.panel ) {
+ each( [ 'button', 'colorbutton', 'splitbutton' ], function( buttonType ) {
+ replaceButtonsTooltips( editor.theme.panel.find( buttonType ) );
+ } );
+
+ addShortcutsToListbox();
+ }
+ } );
+
+ function prepareTooltips() {
+ var access = 'Shift+Alt+';
+ var meta = 'Ctrl+';
+
+ wpTooltips = {};
+
+ // For MacOS: ctrl = \u2303, cmd = \u2318, alt = \u2325
+ if ( tinymce.Env.mac ) {
+ access = '\u2303\u2325';
+ meta = '\u2318';
+ }
+
+ // Some tooltips are translated, others are not...
+ if ( editor.settings.wp_shortcut_labels ) {
+ each( editor.settings.wp_shortcut_labels, function( value, tooltip ) {
+ var translated = editor.translate( tooltip );
+
+ value = value.replace( 'access', access ).replace( 'meta', meta );
+ wpTooltips[ tooltip ] = value;
+
+ // Add the translated so we can match all of them.
+ if ( tooltip !== translated ) {
+ wpTooltips[ translated ] = value;
+ }
+ } );
+ }
+ }
+
+ function getTooltip( tooltip ) {
+ var translated = editor.translate( tooltip );
+ var label;
+
+ if ( ! wpTooltips ) {
+ prepareTooltips();
+ }
+
+ if ( wpTooltips.hasOwnProperty( translated ) ) {
+ label = wpTooltips[ translated ];
+ } else if ( wpTooltips.hasOwnProperty( tooltip ) ) {
+ label = wpTooltips[ tooltip ];
+ }
+
+ return label ? translated + ' (' + label + ')' : translated;
+ }
+
+ function replaceButtonsTooltips( buttons ) {
+
+ if ( ! buttons ) {
+ return;
+ }
+
+ each( buttons, function( button ) {
+ var tooltip;
+
+ if ( button && button.settings.tooltip ) {
+ tooltip = getTooltip( button.settings.tooltip );
+ button.settings.tooltip = tooltip;
+
+ // Override the aria label wiht the translated tooltip + shortcut.
+ if ( button._aria && button._aria.label ) {
+ button._aria.label = tooltip;
+ }
+ }
+ } );
+ }
+
+ function addShortcutsToListbox() {
+ // listbox for the "blocks" drop-down
+ each( editor.theme.panel.find( 'listbox' ), function( listbox ) {
+ if ( listbox && listbox.settings.text === 'Paragraph' ) {
+ each( listbox.settings.values, function( item ) {
+ if ( item.text && wpTooltips.hasOwnProperty( item.text ) ) {
+ item.shortcut = '(' + wpTooltips[ item.text ] + ')';
+ }
+ } );
+ }
+ } );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Experimental: create a floating toolbar.
</span><span class="cx" style="display: block; padding: 0 10px"> * This functionality will change in the next releases. Not recommended for use by plugins.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,6 +807,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> each( buttons, function( item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var itemName;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var tooltip;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function bindSelectorChanged() {
</span><span class="cx" style="display: block; padding: 0 10px"> var selection = editor.selection;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,6 +898,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> item.size = settings.toolbar_items_size;
</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">+ tooltip = item.tooltip || item.title;
+
+ if ( tooltip ) {
+ item.tooltip = getTooltip( tooltip );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> item = Factory.create( item );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> buttonGroup.items.push( item );
</span></span></pre></div>
<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 2019-03-28 22:02:10 UTC (rev 45065)
+++ trunk/src/wp-includes/class-wp-editor.php 2019-03-29 00:48:31 UTC (rev 45066)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1151,7 +1151,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Link plugin
</span><span class="cx" style="display: block; padding: 0 10px"> 'Link' => __( 'Link' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Insert link' => __( 'Insert link' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Insert/edit link' => __( 'Insert/edit link' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'Target' => __( 'Target' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'New window' => __( 'New window' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Text to display' => __( 'Text to display' ),
</span></span></pre>
</div>
</div>
</body>
</html>