Merge "Don't use custom handling for left and right arrow while metaKey is pressed as well."

This commit is contained in:
Catrope 2012-06-21 20:57:17 +00:00 committed by Gerrit Code Review
commit 3e16f8a91e

View file

@ -131,7 +131,7 @@ ve.ce.Surface.prototype.onKeyDown = function( e ) {
*/
// Left arrow
case 37:
if ( !e.altKey && !e.shiftKey && this.model.getSelection().getLength() === 0 ) {
if ( !e.metaKey && !e.altKey && !e.shiftKey && this.model.getSelection().getLength() === 0 ) {
var offset = this.model.getSelection().start;
var relativeContentOffset = this.documentView.model.getRelativeContentOffset( offset, -1 );
var relativeStructuralOffset = this.documentView.model.getRelativeStructuralOffset( offset - 1, -1, true );
@ -156,7 +156,7 @@ ve.ce.Surface.prototype.onKeyDown = function( e ) {
break;
// Right arrow
case 39:
if ( !e.altKey && !e.shiftKey && this.model.getSelection().getLength() === 0 ) {
if ( !e.metaKey && !e.altKey && !e.shiftKey && this.model.getSelection().getLength() === 0 ) {
var offset = this.model.getSelection().start;
var relativeContentOffset = this.documentView.model.getRelativeContentOffset( offset, 1 );
var relativeStructuralOffset = this.documentView.model.getRelativeStructuralOffset( offset + 1, 1, true );