TinyMCE: if the current editor configuration is without toolbars, prevent errors when adding the labels for custom shortcuts.
Fixes #38063. Built from https://develop.svn.wordpress.org/trunk@38997 git-svn-id: http://core.svn.wordpress.org/trunk@38939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a8b19ca223
commit
3807829ac4
|
@ -549,7 +549,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
});
|
||||
}
|
||||
|
||||
if ( editor.settings.wp_shortcut_labels ) {
|
||||
if ( editor.settings.wp_shortcut_labels && editor.theme.panel ) {
|
||||
var labels = {};
|
||||
var access = 'Shift+Alt+';
|
||||
var meta = 'Ctrl+';
|
||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.7-beta1-38996';
|
||||
$wp_version = '4.7-beta1-38997';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue