Ticket #31522: 31522.patch

src/wp-includes/js/quicktags.js

@@ -330 +330 @@
          * @param string arg2 Optional. Ending tag like "</span>"
          * @param string access_key Deprecated Not used
          * @param string title Optional. Button's title="..."
+         * @param string ariaLabel Optional. Button's aria-label="..."
          * @param int priority Optional. Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
          * @param string instance Optional. Limit the button to a specific instance of Quicktags, add to all instances if not present.
          * @return mixed null or the button object that is needed for back-compat.
          */
-        qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
+        qt.addButton = function( id, display, arg1, arg2, access_key, title, ariaLabel, priority, instance ) {
                 var btn;
 
                 if ( !id || !display ) {
@@ -345 +346 @@
                 arg2 = arg2 || '';
 
                 if ( typeof(arg1) === 'function' ) {
-                        btn = new qt.Button(id, display, access_key, title, instance);
+                        btn = new qt.Button(id, display, access_key, title, ariaLabel, instance);
                         btn.callback = arg1;
                 } else if ( typeof(arg1) === 'string' ) {
-                        btn = new qt.TagButton(id, display, arg1, arg2, access_key, title, instance);
+                        btn = new qt.TagButton(id, display, arg1, arg2, access_key, title, ariaLabel, instance);
                 } else {
                         return;
                 }
@@ -404 +405 @@
         };
 
         // a plain, dumb button
-        qt.Button = function(id, display, access, title, instance) {
+        qt.Button = function(id, display, access, title, ariaLabel, instance) {
                 var t = this;
                 t.id = id;
                 t.display = display;
                 t.access = '';
                 t.title = title || '';
+                t.ariaLabel = ariaLabel || '';
                 t.instance = instance || '';
         };
         qt.Button.prototype.html = function(idPrefix) {
                 var title = this.title ? ' title="' + this.title + '"' : '',
+                        ariaLabel = this.ariaLabel ? ' aria-label="' + this.ariaLabel + '"' : '',
                         active, on, wp,
                         dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
 
                 if ( this.id === 'fullscreen' ) {
-                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw qt-fullscreen"' + title + '></button>';
+                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw qt-fullscreen"' + title + ariaLabel + '></button>';
                 } else if ( this.id === 'dfw' ) {
                         active = dfw && dfw.isActive() ? '' : ' disabled="disabled"';
                         on = dfw && dfw.isOn() ? ' active' : '';
 
-                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw' + on + '"' + title + active + '></button>';
+                        return '<button type="button" id="' + idPrefix + this.id + '" class="ed_button qt-dfw' + on + '"' + title + ariaLabel + active + '></button>';
                 }
 
-                return '<input type="button" id="' + idPrefix + this.id + '" class="ed_button button button-small"' + title + ' value="' + this.display + '" />';
+                return '<input type="button" id="' + idPrefix + this.id + '" class="ed_button button button-small"' + title + ariaLabel + ' value="' + this.display + '" />';
         };
         qt.Button.prototype.callback = function(){};
 
         // a button that inserts HTML tag
-        qt.TagButton = function(id, display, tagStart, tagEnd, access, title, instance) {
+        qt.TagButton = function( id, display, tagStart, tagEnd, access, title, ariaLabel, instance ) {
                 var t = this;
-                qt.Button.call(t, id, display, access, title, instance);
+                qt.Button.call( t, id, display, access, title, ariaLabel, instance );
                 t.tagStart = tagStart;
                 t.tagEnd = tagEnd;
         };
@@ -549 +552 @@
 
         // the close tags button
         qt.CloseButton = function() {
-                qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags);
+                qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', '', quicktagsL10n.closeAllOpenTags);
         };
 
         qt.CloseButton.prototype = new qt.Button();
@@ -580 +583 @@
 
         // the link button
         qt.LinkButton = function() {
-                qt.TagButton.call(this, 'link', 'link', '', '</a>');
+                qt.TagButton.call(this, 'link', 'link', '', '</a>', '', '', quicktagsL10n.link);
         };
         qt.LinkButton.prototype = new qt.TagButton();
         qt.LinkButton.prototype.callback = function(e, c, ed, defaultValue) {
@@ -608 +611 @@
 
         // the img button
         qt.ImgButton = function() {
-                qt.TagButton.call(this, 'img', 'img', '', '');
+                qt.TagButton.call(this, 'img', 'img', '', '', '', '', quicktagsL10n.image);
         };
         qt.ImgButton.prototype = new qt.TagButton();
         qt.ImgButton.prototype.callback = function(e, c, ed, defaultValue) {
@@ -666 +669 @@
         };
 
         // ensure backward compatibility
-        edButtons[10] = new qt.TagButton('strong','b','<strong>','</strong>');
-        edButtons[20] = new qt.TagButton('em','i','<em>','</em>'),
+        edButtons[10] = new qt.TagButton('strong','b','<strong>','</strong>','','',quicktagsL10n.strong);
+        edButtons[20] = new qt.TagButton('em','i','<em>','</em>','','',quicktagsL10n.emphasized),
         edButtons[30] = new qt.LinkButton(), // special case
-        edButtons[40] = new qt.TagButton('block','b-quote','\n\n<blockquote>','</blockquote>\n\n'),
-        edButtons[50] = new qt.TagButton('del','del','<del datetime="' + _datetime + '">','</del>'),
-        edButtons[60] = new qt.TagButton('ins','ins','<ins datetime="' + _datetime + '">','</ins>'),
+        edButtons[40] = new qt.TagButton('block','b-quote','\n\n<blockquote>','</blockquote>\n\n','','',quicktagsL10n.blockquote),
+        edButtons[50] = new qt.TagButton('del','del','<del datetime="' + _datetime + '">','</del>','','',quicktagsL10n.deletion),
+        edButtons[60] = new qt.TagButton('ins','ins','<ins datetime="' + _datetime + '">','</ins>','','',quicktagsL10n.insertion),
         edButtons[70] = new qt.ImgButton(), // special case
-        edButtons[80] = new qt.TagButton('ul','ul','<ul>\n','</ul>\n\n'),
-        edButtons[90] = new qt.TagButton('ol','ol','<ol>\n','</ol>\n\n'),
-        edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n'),
-        edButtons[110] = new qt.TagButton('code','code','<code>','</code>'),
-        edButtons[120] = new qt.TagButton('more','more','<!--more-->\n\n',''),
+        edButtons[80] = new qt.TagButton('ul','ul','<ul>\n','</ul>\n\n','','',quicktagsL10n.bulllist),
+        edButtons[90] = new qt.TagButton('ol','ol','<ol>\n','</ol>\n\n','','',quicktagsL10n.numlist),
+        edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','','',quicktagsL10n.listitem),
+        edButtons[110] = new qt.TagButton('code','code','<code>','</code>','','',quicktagsL10n.code),
+        edButtons[120] = new qt.TagButton('more','more','<!--more-->\n\n','','','',quicktagsL10n.more),
         edButtons[140] = new qt.CloseButton();
 
 })();

src/wp-includes/script-loader.php

@@ -97 +97 @@
                 'toggleFullscreen'      => esc_attr__( 'Toggle fullscreen mode' ),
                 'textdirection'         => esc_attr__( 'text direction' ),
                 'toggleTextdirection'   => esc_attr__( 'Toggle Editor Text Direction' ),
-                'dfw'                   => esc_attr__( 'Distraction-free writing mode' )
+                'dfw'                   => esc_attr__( 'Distraction-free writing mode' ),
+                'strong'                => esc_attr__( 'Bold' ),
+                'emphasized'            => esc_attr__( 'Italic' ),
+                'link'                  => esc_attr__( 'Insert/edit link' ),
+                'blockquote'            => esc_attr__( 'Blockquote' ),
+                'deletion'              => esc_attr__( 'Deleted text (strikethrough)' ),
+                'insertion'             => esc_attr__( 'Added text' ),
+                'image'                 => esc_attr__( 'Image' ),
+                'bulllist'              => esc_attr__( 'Bulleted list' ),
+                'numlist'               => esc_attr__( 'Numbered list' ),
+                'listitem'              => esc_attr__( 'List item' ),
+                'code'                  => esc_attr__( 'Code' ),
+                'more'                  => esc_attr__( 'Insert Read More tag' ),
         ) );
 
         $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );