X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=24a9c1a914d3414f6cb1aa149a79d89c34996b77;hb=e41b7b30847fa2889d67d4e418bb9819a85f065d;hp=7c071c33dbaa13e8c94583af35fda61ffadc74bb;hpb=f7d5b6bb6541df3591610e08bf83ccb8b107ea31;p=fa-stable.git

diff --git a/js/utils.js b/js/utils.js
index 7c071c33..24a9c1a9 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -1,104 +1,140 @@
 //
 //	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 mark = document.getElementById('ajaxmark');
+		if(mark) mark.style.visibility = 'visible';
+		if (trigger.tagName=='A') {
+			var content = {};
+			var upload = 0;
+			var url = trigger.href;
+			if (trigger.id) content[trigger.id] = 1;
+		} else {
+		var submitObj = typeof(trigger) == "string" ? 
+			document.getElementsByName(trigger)[0] : trigger;
+		
+		form = form || (submitObj && submitObj.form);
+
+		var upload = form && form.enctype=='multipart/form-data';
+		
+		var url = form ? form.action : 
+		  window.location.toString();
 
-	    this.formValues(submit),
+		var content = this.formInputs(trigger, form, upload);
+
+		if (!form) url = url.substring(0, url.indexOf('?'));
+		
+		if (!submitObj) 
+			content[trigger] = 1;
 			
+		}
+			// this is to avoid caching problems
+		content['_random'] = Math.random()*1234567;
+
+        JsHttpRequest.query(
+            (upload ? "form." : "")+"POST "+url, // force form loader
+	    	content,
             // Function is called when an answer arrives. 
 	    function(result, errors) {
-		        // Write errors to the debug div.
-            document.getElementById('msgbox').innerHTML = errors; 
                 // Write the answer.
+			var newwin = 0;
 	        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) alert('No element "'+id+'"');
+				if(objElement) {
 			    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 if(cmd=='pu') {	// pop-up
+			  	  newwin = 1;
+			  	  window.open(data,'REP_WINDOW','toolbar=no,scrollbar=no,resizable=yes,menubar=no');
+			  } 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;
+		  var mark = document.getElementById('ajaxmark');
+		  if(mark) mark.style.visibility = 'hidden';
+
+		  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
+		  	if(!newwin) { 
+		  		setFocus();
+			}
 		}
             },
             false  // do not disable caching
         );
     }
-/*	//	calls form validation function
-	//
-    JsHttpRequest.validate= function(submit) {
-        JsHttpRequest.query(
-          'POST '+window.location.toString(), // backend
-	    this.formValues('_validate_form'),
-            // Function is called when an answer arrives. 
-	    function(result, errors) {
-		  if (result) {	  
-		    window.location = result;
-		  } else
-			return false;
-		return true;
-	    },
-	    false
-	);
-    }
-*/	// returns input field values submitted when form button 'name' is pressed
-	//
-	JsHttpRequest.formValues = function(inp)
+	// collect all form input values plus inp trigger value
+	JsHttpRequest.formInputs = function(inp, objForm, upload)
 	{
-		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;
 			for( var i=0; i < formElements.length; i++)
 			{
 			  var el = formElements[i];
+			  var name = el.name;
 				if (!el.name) continue;
+				if(upload) { // for form containing file inputs collect all 
+					// form elements and add value of trigger submit button
+					// (internally form is submitted via form.submit() not button click())
+					q[name] = submitObj.type=='submit' && el==submitObj ? el.value : el;
+					continue;
+				}
 				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;
-				var name = el.name;
 				if (name)
 				{
 					if(el.type=='select-multiple')
@@ -116,14 +152,13 @@
 				} 
 			}
 		}
-		// this is to avoid caching problems
-		q['_random'] = Math.random()*1234567;
 		return q;
 	}
 //
 //	User price formatting
 //
-function price_format(post, num, dec, label) {
+function price_format(post, num, dec, label, color) {
+	var el = label ? document.getElementById(post) : document.getElementsByName(post)[0];
 	//num = num.toString().replace(/\$|\,/g,'');
 	if(isNaN(num))
 		num = "0";
@@ -142,11 +177,15 @@ function price_format(post, num, dec, label) {
 	 num = ((sign)?'':'-') + num;
 	 if(dec!=0) num = num + user.ds + cents;
 	if(label)
-	    document.getElementById(post).innerHTML = num;
+	    el.innerHTML = num;
 	else
-	    document.getElementsByName(post)[0].value = num;
+	    el.value = num;
+	if(color) {
+			el.style.color = (sign) ? '' : '#FF0000';
 	}
-	function get_amount(doc, label) {
+}
+
+function get_amount(doc, label) {
 	    if(label)
 		var val = document.getElementById(doc).innerHTML;
 	    else
@@ -154,7 +193,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)
@@ -162,4 +201,32 @@ function goBack() {
 	else
 	 window.history.go(-1);
 }
-	
\ No newline at end of file
+
+function setFocus(name, byId) {
+  if(document.location.pathname.indexOf('index.php') != -1) {
+  	// this is application menu page - set focus on first link
+	// var el = document.getElementById('msgbox');
+	// TODO find first link after msgbox and set focus
+  }
+  if(!name) {
+	if (_focus)	
+		name = _focus;	// last focus set in onfocus handlers
+	else 
+	 if (document.forms.length) {	// no current focus (first page display) -  set it from from last form
+	  var cur = document.getElementsByName('_focus')[document.forms.length-1];
+	  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);
+  }
+}