wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-24 08:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore left/right key presses when there's a modifier

Browse source 
Change-Id: I8998fd27a7d60f5826802153d3ad74ab8a37c3fe
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/236
This commit is contained in:
Gilles Dubuc 2014-02-26 18:04:29 +01:00
parent 5d6d274309
commit 1e880b68ca
2 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/mmv/mmv.lightboxinterface.js
View file

@ -510,6 +510,12 @@
LIP.keydown = function ( e ) {
var isRtl = $( document.body ).hasClass( 'rtl' );
if ( e.altKey || e.shiftKey || e.ctrlKey || e.metaKey ) {
return;
}
e.preventDefault();
switch ( e.which ) {
case 37:
// Left arrow

42
tests/qunit/mmv/mmv.lightboxinterface.test.js
View file

@ -389,7 +389,7 @@
} );
QUnit.test( 'Unblur', 3, function ( assert ) {
var lightbox = new mw.mmv.LightboxInterface( mw.mediaViewer ),
var lightbox = new mw.mmv.LightboxInterface( mw.mmv.mediaViewer ),
oldAnimate = $.fn.animate;
$.fn.animate = function ( target, options ) {
@ -427,4 +427,44 @@
$.fn.animate = oldAnimate;
} );
QUnit.test( 'Keyboard prev/next', 2, function ( assert ) {
var viewer = mw.mmv.mediaViewer,
lightbox = new mw.mmv.LightboxInterface( viewer ),
oldNextImage = viewer.nextImage,
oldPrevImage = viewer.prevImage;
// Since we define both, the test works regardless of RTL settings
viewer.nextImage = function () {
assert.ok( true, 'Next image was open' );
};
viewer.prevImage = function () {
assert.ok( true, 'Prev image was open' );
};
// 37 is left arrow, 39 is right arrow
lightbox.keydown( $.Event( 'keydown', { which : 37 } ) );
lightbox.keydown( $.Event( 'keydown', { which : 39 } ) );
viewer.nextImage = function () {
assert.ok( false, 'Next image should not have been open' );
};
viewer.prevImage = function () {
assert.ok( false, 'Prev image should not have been open' );
};
lightbox.keydown( $.Event( 'keydown', { which : 37, altKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 39, altKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 37, ctrlKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 39, ctrlKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 37, shiftKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 39, shiftKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 37, metaKey : true } ) );
lightbox.keydown( $.Event( 'keydown', { which : 39, metaKey : true } ) );
viewer.nextImage = oldNextImage;
viewer.prevImage = oldPrevImage;
} );
}( mediaWiki, jQuery ) );