Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / js / inserts.js

diff --git a/js/inserts.js b/js/inserts.js
index 5b8d73a7686832d9fc298a4a6f248c0dc9892ffe..a6365d7578d42beb5270ff288b2254b330c9a13b 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -380,7 +380,7 @@ function setHotKeys() {
                        _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))) {
                        var n = _hotkeys.focus;
                        var l = document.links;
                        var cnt = l.length;
@@ -398,7 +398,7 @@ function setHotKeys() {
                        }
                        return stopEv(ev);
                }
-               if((ev.ctrlKey && key == 13) || key == 27) {
+               if((ev.ctrlKey && key == 13) || (key == 27 && ev.altKey)) {
                        _hotkeys.alt = false; // cancel link selection
                        _hotkeys.focus = -1;
                        ev.cancelBubble = true;