Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 15:31:42 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE: fix the keycode check when removing the Edit/Delete toolbar from images on keydown, see #28705

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@29541


git-svn-id: http://core.svn.wordpress.org/trunk@29317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-08-19 19:14:16 +00:00
parent 28bcbcb972
commit 228c77ca2f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
View File

@ -918,9 +918,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
var node, wrap, P, spacer, var node, wrap, P, spacer,
selection = editor.selection, selection = editor.selection,
keyCode = event.keyCode, keyCode = event.keyCode,
dom = editor.dom; dom = editor.dom,
VK = tinymce.util.VK;
if ( keyCode === tinymce.util.VK.ENTER ) { if ( keyCode === VK.ENTER ) {
// When pressing Enter inside a caption move the caret to a new parapraph under it // When pressing Enter inside a caption move the caret to a new parapraph under it
node = selection.getNode(); node = selection.getNode();
wrap = dom.getParent( node, 'div.mceTemp' ); wrap = dom.getParent( node, 'div.mceTemp' );
@ -947,7 +948,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
editor.nodeChanged(); editor.nodeChanged();
selection.setCursorLocation( P, 0 ); selection.setCursorLocation( P, 0 );
} }
} else if ( keyCode === tinymce.util.VK.DELETE || keyCode === tinymce.util.VK.BACKSPACE ) { } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
node = selection.getNode(); node = selection.getNode();
if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) { if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) {
@ -965,10 +966,9 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
removeToolbar(); removeToolbar();
} }
// Key presses will replace the image so we need to remove the toolbar // Most key presses will replace the image so we need to remove the toolbar
if ( toolbarActive ) { if ( toolbarActive ) {
if ( event.ctrlKey || event.metaKey || event.altKey || if ( event.ctrlKey || event.metaKey || event.altKey || ( keyCode < 48 && keyCode !== VK.SPACEBAR ) ) {
( keyCode < 48 && keyCode > 90 ) || keyCode > 186 ) {
return; return;
} }

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.