Ticket #29558: 29558.5.patch

src/wp-includes/class-wp-editor.php

@@ -993 +993 @@
                         'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
                         'Toolbar Toggle' => __( 'Toolbar Toggle' ),
                         'Insert Read More tag' => __( 'Insert Read More tag' ),
+                        'Insert Page Break tag' => __( 'Insert Page Break tag' ),
                         'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
                         'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
                         'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
                         'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
                         'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+                        'Focus shortcuts:' => __( 'Focus shortcuts:' ),
+                        'Image toolbar (when an image is selected)' => __( 'Image toolbar (when an image is selected)' ),
+                        'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
+                        'Editor toolbar' => __( 'Editor toolbar' ),
+                        'Elements path' => __( 'Elements path' )
                 );
 
                 /**

src/wp-includes/css/editor.css

@@ -79 +79 @@
         width: calc( 100% - 36px );
 }
 
-.mce-wp-help .mce-window-head {
-        border-bottom: none;
-}
-
 .mce-textbox,
 .mce-checkbox i.mce-i-checkbox,
 #wp-link .query-results {
@@ -104 +100 @@
         box-shadow: 0 0 2px rgba(30,140,190,0.8);
 }
 
+.mce-container kbd {
+        font-family: monospace;
+        padding: 3px 5px 2px 5px;
+        margin: 0 1px;
+        background: #eaeaea;
+        background: rgba(0,0,0,0.07);
+        font-size: 13px;
+}
+
+.mce-wp-help {
+        height: 400px;
+        overflow: auto;
+}
+
+.mce-wp-help td {
+        padding: 5px;
+}
+
 /* TinyMCE menus */
 .mce-menu,
 .mce-floatpanel.mce-popover {

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -4 +4 @@
 tinymce.ui.FloatPanel.zIndex = 100100;
 
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
-        var DOM = tinymce.DOM, wpAdvButton, modKey, style,
+        var DOM = tinymce.DOM,
+                each = tinymce.each,
+                __ = editor.editorManager.i18n.translate,
+                wpAdvButton, style,
                 last = 0;
 
         if ( typeof window.jQuery !== 'undefined' ) {
@@ -29 +32 @@
                         state = 'hide';
                 }
 
-                tinymce.each( toolbars, function( toolbar, i ) {
+                each( toolbars, function( toolbar, i ) {
                         if ( i > 0 ) {
                                 if ( state === 'hide' ) {
                                         toolbar.hide();
@@ -91 +94 @@
 
                 if ( e.content ) {
                         if ( e.content.indexOf( '<!--more' ) !== -1 ) {
-                                title = editor.editorManager.i18n.translate( 'Read more...' );
+                                title = __( 'Read more...' );
 
                                 e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
                                         return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
@@ -100 +103 @@
                         }
 
                         if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
-                                title = editor.editorManager.i18n.translate( 'Page break' );
+                                title = __( 'Page break' );
 
                                 e.content = e.content.replace( /<!--nextpage-->/g,
                                         '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
@@ -149 +152 @@
                 tag = tag || 'more';
                 classname += ' mce-wp-' + tag;
                 title = tag === 'more' ? 'Read more...' : 'Next page';
-                title = editor.editorManager.i18n.translate( title );
+                title = __( title );
                 html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
                         'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="1" />';
 
@@ -188 +191 @@
         });
 
         editor.addCommand( 'WP_Help', function() {
-                editor.windowManager.open({
-                        url: tinymce.baseURL + '/wp-mce-help.php',
+                var access = tinymce.Env.mac ? 'ctrl + alt' : 'shift + alt',
+                        meta = tinymce.Env.mac ? 'cmd' : 'ctrl',
+                        column1 = [],
+                        column2 = [],
+                        pieces = [],
+                        rows,
+                        i;
+
+                each( {
+                        C: 'Copy',
+                        X: 'Cut',
+                        V: 'Paste',
+                        A: 'Select all',
+                        Z: 'Undo',
+                        Y: 'Redo',
+                        B: 'Bold',
+                        I: 'Italic',
+                        U: 'Underline',
+                        K: 'Insert/edit link'
+                }, function( text, key ) {
+                        column1.push( td( meta + ' + ' + key, text ) );
+                } );
+
+                each( [ 1, 2, 3, 4, 5, 6 ], function( key ) {
+                        column1.push( td( access + ' + ' + key, 'Heading ' + key ) );
+                } );
+
+                each( {
+                        L: 'Align left',
+                        C: 'Align center',
+                        R: 'Align right',
+                        J: 'Justify',
+                        D: 'Strikethrough',
+                        Q: 'Blockquote',
+                        U: 'Bullet list',
+                        O: 'Numbered list',
+                        A: 'Insert/edit link',
+                        S: 'Remove link',
+                        M: 'Insert/edit image',
+                        T: 'Insert Read More tag',
+                        H: 'Keyboard Shortcuts',
+                        X: 'Code',
+                        P: 'Insert Page Break tag',
+                        W: 'Distraction-free writing mode',
+                        N: 'Spellcheck'
+                }, function( text, key ) {
+                        column2.push( td( access + ' + ' + key, text ) );
+                } );
+
+                function td( pattern, text ) {
+                        return '<td>' + ( pattern ? '<kbd>' + pattern + '</kbd>' : '' ) + '</td><td>' + ( __( text ) || '' ) + '</td>';
+                }
+
+                rows = Math.max( column1.length, column2.length );
+
+                for ( i = 1; i <= rows; i++ ) {
+                        pieces.push( '<tr>' + ( column1[ i ] || td() ) + ( column2[ i ] || td() ) + '</tr>' );
+                }
+
+                editor.windowManager.open( {
                         title: 'Keyboard Shortcuts',
-                        width: 450,
-                        height: 420,
-                        classes: 'wp-help',
-                        buttons: { text: 'Close', onclick: 'close' }
-                });
-        });
+                        spacing: 10,
+                        padding: 10,
+                        items: {
+                                type: 'container',
+                                classes: 'wp-help',
+                                html: (
+                                        '<table>' + pieces.join( '' ) + '</table>' +
+                                        '<p>' + __( 'Focus shortcuts:' ) + '</p>' +
+                                        '<table>' +
+                                                '<tr>' + td( 'alt + F8', 'Image toolbar (when an image is selected)' ) + '</tr>' +
+                                                '<tr>' + td( 'alt + F9', 'Editor menu (when enabled)' ) + '</tr>' +
+                                                '<tr>' + td( 'alt + F10', 'Editor toolbar' ) + '</tr>' +
+                                                '<tr>' + td( 'alt + F11', 'Elements path' ) + '</tr>' +
+                                        '</table>'
+                                )
+                        },
+                        buttons: {
+                                text: 'Close',
+                                onclick: 'close'
+                        }
+                } );
+        } );
 
         editor.addCommand( 'WP_Medialib', function() {
                 if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) {
@@ -309 +386 @@
 
                 bodyClass.push('wp-editor');
 
-                tinymce.each( bodyClass, function( cls ) {
+                each( bodyClass, function( cls ) {
                         if ( cls ) {
                                 dom.addClass( doc.body, cls );
                         }
@@ -351 +428 @@
 
                         editor.on( 'PastePostProcess', function( event ) {
                                 // Remove empty paragraphs
-                                tinymce.each( dom.select( 'p', event.node ), function( node ) {
+                                each( dom.select( 'p', event.node ), function( node ) {
                                         if ( dom.isEmpty( node ) ) {
                                                 dom.remove( node );
                                         }
@@ -402 +479 @@
         });
 
         editor.on( 'preInit', function() {
+                var i;
+
                 // Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty
                 editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' );
 
                 if ( tinymce.Env.iOS ) {
                         editor.settings.height = 300;
                 }
-        });
 
-        // Add custom shortcuts
-        modKey = 'alt+shift';
+                for ( i = 1; i <= 9; i++ ) {
+                        editor.shortcuts.remove( 'meta+shift+' + i );
+                }
 
-        editor.addShortcut( modKey + '+c', '', 'JustifyCenter' );
-        editor.addShortcut( modKey + '+r', '', 'JustifyRight' );
-        editor.addShortcut( modKey + '+l', '', 'JustifyLeft' );
-        editor.addShortcut( modKey + '+j', '', 'JustifyFull' );
-        editor.addShortcut( modKey + '+q', '', 'mceBlockQuote' );
-        editor.addShortcut( modKey + '+u', '', 'InsertUnorderedList' );
-        editor.addShortcut( modKey + '+o', '', 'InsertOrderedList' );
-        editor.addShortcut( modKey + '+n', '', 'mceSpellCheck' );
-        editor.addShortcut( modKey + '+s', '', 'unlink' );
-        editor.addShortcut( modKey + '+m', '', 'WP_Medialib' );
-        editor.addShortcut( modKey + '+z', '', 'WP_Adv' );
-        editor.addShortcut( modKey + '+t', '', 'WP_More' );
-        editor.addShortcut( modKey + '+d', '', 'Strikethrough' );
-        editor.addShortcut( modKey + '+h', '', 'WP_Help' );
-        editor.addShortcut( modKey + '+p', '', 'WP_Page' );
-        editor.addShortcut( modKey + '+x', '', 'WP_Code' );
-        editor.addShortcut( 'ctrl+s', '', function() {
-                if ( typeof wp !== 'undefined' && wp.autosave ) {
-                        wp.autosave.server.triggerSave();
+                for ( i = 1; i <= 6; i++ ) {
+                        editor.shortcuts.add( 'access+' + i, '', [ 'FormatBlock', false, 'h' + i ] );
                 }
-        });
-        
+
+                each( {
+                        c: 'JustifyCenter',
+                        r: 'JustifyRight',
+                        l: 'JustifyLeft',
+                        j: 'JustifyFull',
+                        q: 'mceBlockQuote',
+                        u: 'InsertUnorderedList',
+                        o: 'InsertOrderedList',
+                        n: 'mceSpellCheck',
+                        s: 'unlink',
+                        m: 'WP_Medialib',
+                        z: 'WP_Adv',
+                        t: 'WP_More',
+                        d: 'Strikethrough',
+                        h: 'WP_Help',
+                        p: 'WP_Page',
+                        x: 'WP_Code'
+                }, function( command, key ) {
+                        editor.shortcuts.add( 'access+' + key, '', command );
+                } );
+
+                editor.addShortcut( 'ctrl+s', '', function() {
+                        if ( typeof wp !== 'undefined' && wp.autosave ) {
+                                wp.autosave.server.triggerSave();
+                        }
+                } );
+        } );
+
         /**
          * Experimental: create a floating toolbar.
-         * This functionality will change in the next releases. Not recommennded for use by plugins.
-         */             
+         * This functionality will change in the next releases. Not recommended for use by plugins.
+         */
         ( function() {
-                var DOM = tinymce.DOM,
-                        each = tinymce.each,
-                        Factory = tinymce.ui.Factory,
+                var Factory = tinymce.ui.Factory,
                         settings = editor.settings,
                         currentToolbar,
                         currentSelection;