X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=24a9c1a914d3414f6cb1aa149a79d89c34996b77;hb=9effb4c80e0cf6f076c17850a938310b5db85aaf;hp=5dbbcbf96c7cfc42b5494c32db685f313e84bf2a;hpb=fed6bc04a7b050a0b69136a332e92ee651812487;p=fa-stable.git

diff --git a/js/utils.js b/js/utils.js
index 5dbbcbf9..24a9c1a9 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -9,29 +9,42 @@
 //		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();
 
-		if (!form) url = url.substring(0, url.indexOf('?'));
+		var content = this.formInputs(trigger, form, upload);
 
-		var values = this.formValues(trigger, form);
+		if (!form) url = url.substring(0, url.indexOf('?'));
+		
 		if (!submitObj) 
-			values[trigger] = 1;
-		// this is to avoid caching problems
-		values['_random'] = Math.random()*1234567;
+			content[trigger] = 1;
+			
+		}
+			// this is to avoid caching problems
+		content['_random'] = Math.random()*1234567;
+
         JsHttpRequest.query(
-            'POST '+url, // backend
-	    	values,
+            (upload ? "form." : "")+"POST "+url, // force form loader
+	    	content,
             // Function is called when an answer arrives. 
 	    function(result, errors) {
                 // Write the answer.
+			var newwin = 0;
 	        if (result) {
 		  	  for(var i in result ) { 
 			  atom = result[i];
@@ -46,11 +59,13 @@
     		  if(cmd=='as') {
 				  eval("objElement.setAttribute('"+property+"',"+data+");");
 			  } else if(cmd=='up') {
-//				if(!objElement) debug('No element "'+id+'"');
+//				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/enable element
 				  objElement.disabled = data;
 			  } else if(cmd=='fc') { // set focus
@@ -59,6 +74,9 @@
 				  eval(data);
 			  } else if(cmd=='rd') {	// client-side redirection
 				  window.location = data;
+			  } 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;
 			}
@@ -66,25 +84,28 @@
 
         // 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
-		  setFocus();
+		  	if(!newwin) { 
+		  		setFocus();
+			}
 		}
             },
             false  // do not disable caching
         );
     }
-	// returns input field values submitted when form button 'name' is pressed
-	//
-	JsHttpRequest.formValues = function(inp, objForm)
+	// collect all form input values plus inp trigger value
+	JsHttpRequest.formInputs = function(inp, objForm, upload)
 	{
 		var submitObj = inp;
 		var q = {};
-		
 
 		if (typeof(inp) == "string")
 			submitObj = document.getElementsByName(inp)[0];
@@ -99,7 +120,14 @@
 			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)
@@ -107,7 +135,6 @@
 					continue;
 				if (el.disabled && el.disabled == true)
 					continue;
-				var name = el.name;
 				if (name)
 				{
 					if(el.type=='select-multiple')
@@ -130,7 +157,8 @@
 //
 //	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";
@@ -149,9 +177,12 @@ 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) {
@@ -172,12 +203,17 @@ function goBack() {
 }
 
 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 {	// no current focus -  set it from from hidden var (first page display)
-	  var cur = document.getElementsByName('_focus')[0];
+	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;
 	}
   }