wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "(bug 48335) Use more generic approach to filter out non-character key presses."

Browse source
This commit is contained in:
jenkins-bot 2013-06-14 03:34:44 +00:00 committed by Gerrit Code Review
parent 6144976c1e 4e377629e3
commit bb59895d92
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ve/ce/ve.ce.Surface.js
View file

@ -474,6 +474,7 @@ ve.ce.Surface.prototype.onDocumentKeyPress = function ( e ) {
var selection, prevNode, documentModel = this.model.getDocument();
// Prevent IE from editing Aliens/Entities
// TODO: Better comment about what's going on here is needed.
if ( $.browser.msie === true ) {
selection = this.model.getSelection();
if ( selection.start !== 0 && selection.isCollapsed() ) {
@ -488,20 +489,14 @@ ve.ce.Surface.prototype.onDocumentKeyPress = function ( e ) {
}
}
// FF fires keypress for bunch of function keys that we want to ignore
if ( ve.ce.isArrowKey( e.keyCode ) ||
ve.ce.isShortcutKey( e ) ||
e.keyCode === 13 ||
e.which === ve.Keys.UNDEFINED ||
e.keyCode === ve.Keys.BACKSPACE ||
e.keyCode === ve.Keys.END ||
e.keyCode === ve.Keys.ENTER ||
e.keyCode === ve.Keys.HOME ||
e.keyCode === ve.Keys.TAB ||
e.keyCode === ve.Keys.PAGEDOWN ||
e.keyCode === ve.Keys.PAGEUP ) {
// Filter out non-character keys. If those keys wouldn't be filtered out unexpected content
// deletion would occur in case when selection is not collapsed and user press home key for
// instance (Firefox fires keypress for home key).
// TODO: Should be covered with Selenium tests.
if ( e.which === 0 || e.charCode === 0 ) {
return;
}
this.handleInsertion();
setTimeout( ve.bind( function () {
this.surfaceObserver.start();