Changeset 21272

Timestamp:

07/14/2012 01:46:54 AM (13 years ago)

Author:

azaozz

Message:

TinyMCE: add the Alt + W shortcut only when DFW is loaded and Alt + G only when MCE fullscreen is loaded, fixes #21197

File:

• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -271 +271 @@
             ed.addShortcut(mod_key + '+h', 'help_desc', 'WP_Help');
             ed.addShortcut(mod_key + '+p', 'wordpress.wp_page_desc', 'WP_Page');
-            ed.addShortcut(mod_key + '+w', 'wordpress.wp_fullscreen_desc', 'wpFullScreen');
-            ed.addShortcut(mod_key + '+g', 'fullscreen.desc', 'mceFullScreen');
             ed.addShortcut('ctrl+s', 'save_desc', function(){if('function'==typeof autosave)autosave();});
+
+            if ( /\bwpfullscreen\b/.test(ed.settings.plugins) )
+                ed.addShortcut(mod_key + '+w', 'wordpress.wp_fullscreen_desc', 'wpFullScreen');
+            else if ( /\bfullscreen\b/.test(ed.settings.plugins) )
+                ed.addShortcut(mod_key + '+g', 'fullscreen.desc', 'mceFullScreen');
 
             // popup buttons for images and the gallery