From 6c081d396a7c64c95afb916a03e99f574e2e9985 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 17 Jan 2018 06:27:21 +0000 Subject: [PATCH] Editor: Use explicit context instead of a trailing space for `Edit` string in TinyMCE plugins. Props scottlee, ayubadiputra, NathanAtmoz. Fixes #42543. git-svn-id: https://develop.svn.wordpress.org/trunk@42523 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 2 +- src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js | 2 +- src/wp-includes/js/tinymce/plugins/wplink/plugin.js | 2 +- src/wp-includes/js/tinymce/plugins/wpview/plugin.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index 1b92ac51a1..8946aad17b 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -1275,7 +1275,7 @@ final class _WP_Editors { 'Distraction-free writing mode' => array( __( 'Distraction-free writing mode' ), 'accessW' ), '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 + 'Edit|button' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar 'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog 'Apply' => __( 'Apply' ), // Tooltip for the 'apply' button in the inline link dialog 'Link options' => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 9ffaba102a..0f0a5daf45 100644 --- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -18,7 +18,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } ); editor.addButton( 'wp_img_edit', { - tooltip: 'Edit ', // trailing space is needed, used for context + tooltip: 'Edit|button', // '|button' is not displayed, only used for context icon: 'dashicon dashicons-edit', onclick: function() { editImage( editor.selection.getNode() ); diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js index f20d7c9d89..2314d835a9 100644 --- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -564,7 +564,7 @@ } ); editor.addButton( 'wp_link_edit', { - tooltip: 'Edit ', // trailing space is needed, used for context + tooltip: 'Edit|button', // '|button' is not displayed, only used for context icon: 'dashicon dashicons-edit', cmd: 'WP_Link' } ); diff --git a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js index d087c3660d..25da4d04c5 100644 --- a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js @@ -155,7 +155,7 @@ } ); editor.addButton( 'wp_view_edit', { - tooltip: 'Edit ', // trailing space is needed, used for context + tooltip: 'Edit|button', // '|button' is not displayed, only used for context icon: 'dashicon dashicons-edit', onclick: function() { var node = editor.selection.getNode();