sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29541 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-08-19 19:13:08 +00:00
parent 885a072da6
commit 197b2c6cdc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/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,
selection = editor.selection,
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
node = selection.getNode();
wrap = dom.getParent( node, 'div.mceTemp' );
@ -947,7 +948,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
editor.nodeChanged();
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();
if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) {
@ -965,10 +966,9 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
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 ( event.ctrlKey || event.metaKey || event.altKey ||
( keyCode < 48 && keyCode > 90 ) || keyCode > 186 ) {
if ( event.ctrlKey || event.metaKey || event.altKey || ( keyCode < 48 && keyCode !== VK.SPACEBAR ) ) {
return;
}