From 288b1fd4f380eb536fbac8e627f87c169bfe837f Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 8 Apr 2014 02:31:02 +0000 Subject: [PATCH] Nuke the TinyMCE help dialog as it is duplicated by help tabs. This leaves just Keyboard Shortcuts. fixes #27100. git-svn-id: https://develop.svn.wordpress.org/trunk@28032 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 2 +- .../js/tinymce/plugins/wordpress/plugin.js | 4 +- src/wp-includes/js/tinymce/wp-mce-help.php | 114 +----------------- src/wp-includes/version.php | 2 +- 4 files changed, 9 insertions(+), 113 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index acb20df264..5efe1fee49 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -962,7 +962,7 @@ final class _WP_Editors { 'Format' => _x( 'Format', 'TinyMCE menu' ), // WordPress strings - 'Editor Help' => __( 'Editor Help' ), + 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ), 'Toolbar Toggle' => __( 'Toolbar Toggle' ), 'Insert Read More tag' => __( 'Insert Read More tag' ), 'Distraction Free Writing' => __( 'Distraction Free Writing' ), diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 946f7a7ab3..c843dba264 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -181,7 +181,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { editor.addCommand( 'WP_Help', function() { editor.windowManager.open({ url: tinymce.baseURL + '/wp-mce-help.php', - title: 'Editor Help', + title: 'Keyboard Shortcuts', width: 450, height: 420, inline: 1, @@ -211,7 +211,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); editor.addButton( 'wp_help', { - tooltip: 'Editor Help', + tooltip: 'Keyboard Shortcuts', cmd: 'WP_Help' }); diff --git a/src/wp-includes/js/tinymce/wp-mce-help.php b/src/wp-includes/js/tinymce/wp-mce-help.php index c9a070195f..cd5e6be8ca 100644 --- a/src/wp-includes/js/tinymce/wp-mce-help.php +++ b/src/wp-includes/js/tinymce/wp-mce-help.php @@ -13,7 +13,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); > -<?php _e('Editor Help'); ?> +<?php _e('Keyboard Shortcuts'); ?>