aboutsummaryrefslogtreecommitdiff
path: root/p/scripts/shortcut.js
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-31 14:45:37 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-31 14:45:37 +0100
commita97bbd9bd54c5fa56d54b3c214cf4e8af96af8b2 (patch)
tree6e83890bc1b3814a12c3b7bedc0d5944f30f507b /p/scripts/shortcut.js
parent42fd539a1b14f883077048a35864b4294b6efe94 (diff)
parente91b72b63cd11ae3c4f59e48439e93955242c673 (diff)
Merge branch 'dev'
Conflicts: CHANGELOG README.fr.md README.md app/Controllers/feedController.php app/Controllers/indexController.php app/i18n/en.php app/i18n/fr.php app/views/helpers/view/normal_view.phtml app/views/stats/index.phtml app/views/stats/repartition.phtml constants.php p/scripts/main.js
Diffstat (limited to 'p/scripts/shortcut.js')
-rw-r--r--p/scripts/shortcut.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/p/scripts/shortcut.js b/p/scripts/shortcut.js
index debaffbaa..e78cf6f5e 100644
--- a/p/scripts/shortcut.js
+++ b/p/scripts/shortcut.js
@@ -43,7 +43,9 @@ shortcut = {
//Find Which key is pressed
if (e.keyCode) code = e.keyCode;
else if (e.which) code = e.which;
- var character = String.fromCharCode(code).toLowerCase();
+ if (code == 32 || (code >= 48 && code <= 90) || (code >= 96 && code <= 111) || (code >= 186 && code <= 192) || (code >= 219 && code <= 222)) { //FreshRSS
+ var character = String.fromCharCode(code).toLowerCase();
+ }
if(code == 188) character=","; //If the user presses , when the type is onkeydown
if(code == 190) character="."; //If the user presses , when the type is onkeydown