From 8bcbe552385940b26795cbc84da62b28dd65fb5d Mon Sep 17 00:00:00 2001 From: Luke Faraone Date: Wed, 7 Nov 2012 10:23:46 -0500 Subject: [PATCH] Clarify line in hotkey.js per trac #253 (imported from commit d5bacdd4cef2f62ba22e3a47d25c3a656cf601c0) --- zephyr/static/js/hotkey.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js index c76569b4d4..432914af3d 100644 --- a/zephyr/static/js/hotkey.js +++ b/zephyr/static/js/hotkey.js @@ -72,11 +72,13 @@ function process_hotkey(code) { } if (num_pressed_keys() > 1 && - // "shift" "caps lock" - !((pressed_keys[16] === true || pressed_keys[20]) && + // "shift" "caps lock" + !((pressed_keys[16] || pressed_keys[20]) && num_pressed_keys() === 2)) { // If you are already holding down another key, none of these - // actions apply. + // actions apply. However, if you are holding down exactly one + // other key and that key is shift or caps lock, we still want + // to continue processing. return false; }