X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=5dbbcbf96c7cfc42b5494c32db685f313e84bf2a;hb=6918bb5a9e5505ebdeb1abd93127a68db5ece8b6;hp=746fb77bac676f83a17c1d9a306d349ef72b74a5;hpb=2dc462a7fa1972d04b569fb7156747c59bf6d069;p=fa-stable.git

diff --git a/js/utils.js b/js/utils.js
index 746fb77b..5dbbcbf9 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -1,52 +1,78 @@
 //
 //	JsHttpRequest class extensions.
 //
-    JsHttpRequest.request= function(submit) {
-        JsHttpRequest.query(
-            'POST '+window.location.toString(), // backend
+// Main functions for asynchronus form submitions
+// 	Trigger is the source of request and can have following forms:
+// 	- input object - all form values are also submited
+//  - arbitrary string - POST var trigger with value 1 is added to request;
+//		if form parameter exists also form values are submited, otherwise
+//		request is directed to current location 
+// 
+    JsHttpRequest.request= function(trigger, form) {
+
+		
+		var submitObj = typeof(trigger) == "string" ? 
+			document.getElementsByName(trigger)[0] : trigger;
+		
+		form = form || (submitObj && submitObj.form);
 
-	    this.formValues(submit),
-			
+		var url = form ? form.action : 
+		  window.location.toString();
+
+		if (!form) url = url.substring(0, url.indexOf('?'));
+
+		var values = this.formValues(trigger, form);
+		if (!submitObj) 
+			values[trigger] = 1;
+		// this is to avoid caching problems
+		values['_random'] = Math.random()*1234567;
+        JsHttpRequest.query(
+            'POST '+url, // backend
+	    	values,
             // Function is called when an answer arrives. 
 	    function(result, errors) {
-		        // Write errors to the debug div.
-            document.getElementById('msgbox').innerHTML = errors; 
                 // Write the answer.
 	        if (result) {
-		    for(var i in result ) { 
-			atom = result[i];
-			
-			cmd = atom['n'];
-			property = atom['p'];
-			type = atom['c'];
-			id = atom['t'];
-			data = atom['data'];
-//			alert(cmd+':'+property+':'+type+':'+id+':'+data);
+		  	  for(var i in result ) { 
+			  atom = result[i];
+			  cmd = atom['n'];
+			  property = atom['p'];
+			  type = atom['c'];
+			  id = atom['t'];
+			  data = atom['data'];
+//				debug(cmd+':'+property+':'+type+':'+id);
 			// seek element by id if there is no elemnt with given name
-			objElement = document.getElementsByName(id)[0] || document.getElementById(id);
-    		if(cmd=='as') {
-				  eval("objElement."+property+"=data;");
-			} else if(cmd=='up') {
-			  if(!objElement) debug('No element "'+id+'"');
+			  objElement = document.getElementsByName(id)[0] || document.getElementById(id);
+    		  if(cmd=='as') {
+				  eval("objElement.setAttribute('"+property+"',"+data+");");
+			  } else if(cmd=='up') {
+//				if(!objElement) debug('No element "'+id+'"');
 			    if (objElement.tagName == 'INPUT' || objElement.tagName == 'TEXTAREA')
 				  objElement.value = data;
 			    else
 				  objElement.innerHTML = data; // selector, div, span etc
-			} else if(cmd=='di') { // disable element
+		  	  } else if(cmd=='di') { // disable/enable element
 				  objElement.disabled = data;
-			} else if(cmd=='js') {	// evaluate js code
+			  } else if(cmd=='fc') { // set focus
+				  _focus = data;
+			  } else if(cmd=='js') {	// evaluate js code
 				  eval(data);
-			} else if(cmd=='rd') {	// client-side redirection
-			    debug('redirecting '+data);
+			  } else if(cmd=='rd') {	// client-side redirection
 				  window.location = data;
-			} else {
+			  } else {
 				  errors = errors+'<br>Unknown ajax function: '+cmd;
 			}
-		    }
-			Behaviour.apply();
-			if (errors.length>0)
-			// window.scrollTo(0,0);
-			document.getElementById('msgbox').scrollIntoView(true);
+		  }
+
+        // Write errors to the debug div.
+		  document.getElementById('msgbox').innerHTML = errors;
+
+		  Behaviour.apply();
+		  if (errors.length>0)
+			window.scrollTo(0,0);
+			//document.getElementById('msgbox').scrollIntoView(true);
+	  // Restore focus if we've just lost focus because of DOM element refresh
+		  setFocus();
 		}
             },
             false  // do not disable caching
@@ -54,19 +80,19 @@
     }
 	// returns input field values submitted when form button 'name' is pressed
 	//
-	JsHttpRequest.formValues = function(inp)
+	JsHttpRequest.formValues = function(inp, objForm)
 	{
-		var objForm;
-		var submitObj;
+		var submitObj = inp;
 		var q = {};
 		
+
 		if (typeof(inp) == "string")
 			submitObj = document.getElementsByName(inp)[0];
 		else
 			submitObj = inp;
-		if(submitObj) {
-		  objForm = submitObj.form;
-		}
+		
+		objForm = objForm || (submitObj && submitObj.form);
+
 		if (objForm)
 		{
 			var formElements = objForm.elements;
@@ -77,7 +103,7 @@
 				if (el.type )
 				  if( 
 				  ((el.type == 'radio' || el.type == 'checkbox') && el.checked == false)
-				  || (el.type == 'submit' && el.name!=submitObj.name))
+				  || (el.type == 'submit' && (!submitObj || el.name!=submitObj.name)))
 					continue;
 				if (el.disabled && el.disabled == true)
 					continue;
@@ -99,8 +125,6 @@
 				} 
 			}
 		}
-		// this is to avoid caching problems
-		q['_random'] = Math.random()*1234567;
 		return q;
 	}
 //
@@ -128,8 +152,9 @@ function price_format(post, num, dec, label) {
 	    document.getElementById(post).innerHTML = num;
 	else
 	    document.getElementsByName(post)[0].value = num;
-	}
-	function get_amount(doc, label) {
+}
+
+function get_amount(doc, label) {
 	    if(label)
 		var val = document.getElementById(doc).innerHTML;
 	    else
@@ -137,7 +162,7 @@ function price_format(post, num, dec, label) {
 		val = val.replace(new RegExp('\\'+user.ts, 'g'),'');
 		val = val.replace(new RegExp('\\'+user.ds, 'g'),'.');
 		return 1*val;
-	}
+}
 
 function goBack() {
 	if (window.history.length <= 1)
@@ -145,3 +170,27 @@ function goBack() {
 	else
 	 window.history.go(-1);
 }
+
+function setFocus(name, byId) {
+
+  if(!name) {
+	if (_focus)	
+		name = _focus;	// last focus set in onfocus handlers
+	else {	// no current focus -  set it from from hidden var (first page display)
+	  var cur = document.getElementsByName('_focus')[0];
+	  if(cur) name = cur.value;
+	}
+  }
+  if(byId)
+	el = document.getElementById(name);
+  else
+  	el = document.getElementsByName(name)[0];
+
+  if(el && el.focus) {
+    // The timeout is needed to prevent unpredictable behaviour on IE & Gecko.
+    // Using tmp var prevents crash on IE5
+	
+    var tmp = function() {el.focus(); if (el.select) el.select();};
+	setTimeout(tmp, 0);
+  }
+}