From 4360d117e22dd6864d2917b3f8e523bb6eb8de00 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 7 Apr 2014 23:52:55 +0000 Subject: [PATCH] TinyMCE help modal: - Don't load the old tiny_mce_popup.js. - Add the shortcut for and the second shortcut for link to the shortcuts listing. - Update some of the text. See #27100 git-svn-id: https://develop.svn.wordpress.org/trunk@28027 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 2 +- .../js/tinymce/plugins/wordpress/plugin.js | 3 +- src/wp-includes/js/tinymce/wp-mce-help.php | 40 +++++++++---------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index cd102b0b37..acb20df264 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 - 'Help' => __( 'Help' ), + 'Editor Help' => __( 'Editor Help' ), '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 234e2d0f98..946f7a7ab3 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -181,6 +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', width: 450, height: 420, inline: 1, @@ -210,7 +211,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); editor.addButton( 'wp_help', { - tooltip: 'Help', + tooltip: 'Editor Help', 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 943586f09a..d449008998 100644 --- a/src/wp-includes/js/tinymce/wp-mce-help.php +++ b/src/wp-includes/js/tinymce/wp-mce-help.php @@ -13,8 +13,8 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); > -<?php _e('Rich Editor Help'); ?> - +<?php _e('Editor Help'); ?> +