projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed document mailing.
[fa-stable.git]
/
js
/
inserts.js
diff --git
a/js/inserts.js
b/js/inserts.js
index 0c0067fdfcd2486315717f544c6fc09f500656e1..a1640de0c60c18b458747f96e3504d6ddb25e234 100644
(file)
--- 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) {
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
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;
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);
}
_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;
var n = _hotkeys.focus;
var l = document.links;
var cnt = l.length;