X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=6d8b1ff71caad6a1284010a4d3941f02686edd27;hb=e1ad4f3f77cb20f692185b0b5e493820c5fb7f77;hp=e2d7cac8f8c9ee5f9f6c33b2b716c3cc2ae4da08;hpb=dc3ea18e9a7fa55826d590d73ed3a7215e34172a;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index e2d7cac8..6d8b1ff7 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -213,10 +213,11 @@ var inserts = {
 	function(e) {
 		    e.onclick = function() {
 			    save_focus(e);
-					if (e.getAttribute('aspect') == 'process')
-						JsHttpRequest.request(this, null, 60000);
-					else
-						JsHttpRequest.request(this);
+			    var asp = e.getAttribute('aspect')
+				if (asp && asp.indexOf('process') !== -1)
+					JsHttpRequest.request(this, null, 60000);
+				else
+					JsHttpRequest.request(this);
 				return false;
 		    }
 	},
@@ -258,7 +259,7 @@ var inserts = {
 				}
 			}
 	},
-	'button[aspect=selector], input[aspect=selector]': function(e) {
+	'button[aspect*selector], input[aspect*selector]': function(e) {
 		e.onclick = function() {
 			passBack(this.getAttribute('rel'));
 			return false;
@@ -277,7 +278,7 @@ var inserts = {
 	'a.printlink': 	function(l) {
 		l.onclick = function() {
 		    save_focus(this);
-			JsHttpRequest.request(this);
+			JsHttpRequest.request(this, null, 60000);
 			return false;
 		}
 	},
@@ -357,7 +358,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;
@@ -386,13 +387,19 @@ function setHotKeys() {
 				for (var i=0; i<form.elements.length; i++){
 					var el = form.elements[i];
 					var asp = el.getAttribute('aspect');
-					if (el.className!='editbutton' && asp=='selector' && (key==13 || key==27)) {
+					
+
+					if (el.className!='editbutton' && (asp && asp.indexOf('selector') !== -1) && (key==13 || key==27)) {
 						passBack(key==13 ? el.getAttribute('rel') : false);
 						ev.returnValue = false;
 						return false;
 					}
-					if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
-						JsHttpRequest.request(el);
+					if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) {
+
+						if (asp.indexOf('process') !== -1)
+							JsHttpRequest.request(el, null, 60000);
+						else
+							JsHttpRequest.request(el);
 						ev.returnValue = false;
 						return false;
 					}