From 97b0f6e0bdada3a1bf5d74117c7b472c8d56f15d Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Wed, 17 Jul 2013 17:54:20 +0200 Subject: [PATCH] Makes previews less keyboard greedy. --- src/_h5ai/client/js/inc/ext/preview-img.js | 11 ++++++++--- src/_h5ai/client/js/inc/ext/preview-txt.js | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/_h5ai/client/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js index 2c89d02f..bf693a9b 100644 --- a/src/_h5ai/client/js/inc/ext/preview-img.js +++ b/src/_h5ai/client/js/inc/ext/preview-img.js @@ -178,17 +178,22 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/settings', 'core/resource', var key = event.which; if (key === 27) { // esc + event.preventDefault(); + event.stopImmediatePropagation(); onExit(); } else if (key === 8 || key === 37 || key === 40) { // backspace, left, down + event.preventDefault(); + event.stopImmediatePropagation(); onPrevious(); } else if (key === 13 || key === 32 || key === 38 || key === 39) { // enter, space, up, right + event.preventDefault(); + event.stopImmediatePropagation(); onNext(); } else if (key === 70) { // f + event.preventDefault(); + event.stopImmediatePropagation(); onFullscreen(); } - - event.preventDefault(); - event.stopImmediatePropagation(); }, initItem = function (item) { diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index 27478b22..508fd323 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -248,15 +248,18 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', var key = event.which; if (key === 27) { // esc + event.preventDefault(); + event.stopImmediatePropagation(); onExit(); } else if (key === 8 || key === 37 || key === 40) { // backspace, left, down + event.preventDefault(); + event.stopImmediatePropagation(); onPrevious(); } else if (key === 13 || key === 32 || key === 38 || key === 39) { // enter, space, up, right + event.preventDefault(); + event.stopImmediatePropagation(); onNext(); } - - event.preventDefault(); - event.stopImmediatePropagation(); }, initItem = function (item) {