Ticket #29558: 29558.2.patch

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, wpAdvButton, style,
                 last = 0;
 
         if ( typeof window.jQuery !== 'undefined' ) {
@@ -410 +410 @@
                 }
         });
 
-        // Add custom shortcuts
-        modKey = 'alt+shift';
+        tinymce.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.addShortcut( 'access+' + key, '', command );
+        } );
 
-        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();
                 }
         });
-        
+
         /**
          * Experimental: create a floating toolbar.
          * This functionality will change in the next releases. Not recommennded for use by plugins.
-         */             
+         */
         ( function() {
                 var DOM = tinymce.DOM,
                         each = tinymce.each,