vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TinyMCE wpView: ignore more keys when the caret is around a view. Part props avryl, fixes #29115.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29535 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-08-19 03:26:14 +00:00
parent c6e4597bbf
commit cd048c0154
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/js/tinymce/plugins/wpview/plugin.js
View File

@ -353,6 +353,14 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
}
});
// Excludes arrow keys, delete, backspace, enter, space bar.
function isSpecialKey( key ) {
return ( ( key <= 47 && key !== VK.SPACEBAR && key !== VK.ENTER && key !== VK.DELETE && key !== VK.BACKSPACE && ( key < 37 || key > 40 ) ) ||
key === 144 || key === 145 || // Num Lock, Scroll Lock
( key >= 91 && key <= 93 ) || // Windows keys
( key >= 112 && key <= 123 ) ); // F keys
}
// (De)select views when arrow keys are used to navigate the content of the editor.
editor.on( 'keydown', function( event ) {
var key = event.keyCode,
@ -410,9 +418,10 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
} else {
setViewCursor( false, view );
}
event.preventDefault();
// Ignore keys that don't insert anything.
} else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
} else if ( ! isSpecialKey( key ) ) {
removeView( selected );
if ( key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) {
@ -472,6 +481,11 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
return;
}
if ( isSpecialKey( key ) ) {
// ignore
return;
}
if ( ( cursorAfter && key === VK.UP ) || ( cursorBefore && key === VK.BACKSPACE ) ) {
if ( view.previousSibling ) {
if ( getView( view.previousSibling ) ) {