From 5ffaecd11aa8b05b8a0462b57b91644b9223ae10 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 23 Mar 2009 12:24:37 +0000 Subject: [PATCH] Fixed kbd acess issue after AltTab. --- CHANGELOG.txt | 4 ++++ js/inserts.js | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e9b94c1..ca61d0c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +23-Mar-2009 Janusz Dobrowolski +# Fixed keybord access issue after AltTab +$ /js/inserts.js + 23-Mar-2009 Joe Hunt # Bad thousand/decimal formatting in XLS reports.(OpenOffice) $ /reporting/including/excel_report.inc diff --git a/js/inserts.js b/js/inserts.js index 0c0067f..a1640de 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -170,6 +170,7 @@ var inserts = { ev = ev||window.event; key = ev.keyCode||ev.which; if((ev.ctrlKey && key == 13) || key == 27) { + _hotkeys.alt = false; ev.cancelBubble = true; if(ev.stopPropagation) ev.stopPropagation(); // here ctrl-enter/escape support @@ -317,17 +318,15 @@ function setHotKeys() { document.onkeydown = function(ev) { ev = ev||window.event; key = ev.keyCode||ev.which; - if (key == 18 && !ev.ctrlKey) { // start selection, skip Win AltGr - _hotkeys.alt = true; - _hotkeys.focus = -1; - return stopEv(ev); - } else - if (key == 27) { // cancel selection + + if (key == 27 && ev.altKey) { // cancel selection _hotkeys.alt = false; _hotkeys.focus = -1; return stopEv(ev); } - else if (_hotkeys.alt && ((key>47 && key<58) || (key>64 && key<91))) { + else + if (ev.altKey && !ev.ctrlKey && ((key>47 && key<58) || (key>64 && key<91))) { + _hotkeys.alt = true; var n = _hotkeys.focus; var l = document.links; var cnt = l.length; -- 2.30.2