Restored Esc hotkey on cancel buttons.

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

diff --git a/js/inserts.js b/js/inserts.js
index 4d665e843fbe8b6a73353a745a4cbe16ec7ed96b..d7fa75353de37f0865a5dfaf3e9a627b1f03552e 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -214,7 +214,7 @@ var inserts = {
                    e.onclick = function() {
                            save_focus(e);
                                        if (e.getAttribute('aspect') == 'process')
-                                               JsHttpRequest.request(this, null, 30000);
+                                               JsHttpRequest.request(this, null, 60000);
                                        else
                                                JsHttpRequest.request(this);
                                return false;
@@ -305,7 +305,7 @@ var inserts = {
                    }
                }
            }
-       },
+       }
 /*     'tr.editrow': function(e) {
                        e.onkeydown = function(ev) { 
                        ev = ev||window.event;
@@ -332,6 +332,7 @@ var inserts = {
        }
 */
 };
+
 function stopEv(ev) {
                        if(ev.preventDefault) {
                                ev.preventDefault();
@@ -356,7 +357,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;