summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2012-12-17 07:38:53 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2012-12-17 07:38:53 -0800
commitd085fdf8ea01c3ad7d3cb6af5361e501404b3c41 (patch)
tree046817c6b92f0ca127874f76e0b421928d3f5382
parent6861d4271508e96a27c4e9e2e7954ef90cfa8034 (diff)
parente8897c2b7e3a392f193e3e53dbbeb8178f5c2078 (diff)
downloadnextcloud-server-d085fdf8ea01c3ad7d3cb6af5361e501404b3c41.tar.gz
nextcloud-server-d085fdf8ea01c3ad7d3cb6af5361e501404b3c41.zip
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
prevent keyboardshortcuts from catching events outside the main doc - e....
-rw-r--r--apps/files/js/keyboardshortcuts.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index 562755f55b7..cc2b5d42139 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -127,6 +127,9 @@ var Files = Files || {};
}
Files.bindKeyboardShortcuts = function(document, $) {
$(document).keydown(function(event) { //check for modifier keys
+ if(!$(event.target).is('body')) {
+ return;
+ }
var preventDefault = false;
if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
if (