X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=0fba1abb5cd2b79fe93407a5f8f1cc98d8e858fe;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=f4a4f65cc0f4717af7a14d434325566bf0f018d5;hpb=db9975842d1a1be7977355a3cc0875f6d68023dd;p=fa-stable.git

diff --git a/js/utils.js b/js/utils.js
index f4a4f65c..0fba1abb 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -8,6 +8,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+function set_mark(img) {
+	var box = document.getElementById('ajaxmark');
+	if(box) {
+		if(img) box.src = user.theme+'images/'+ img;
+		box.style.visibility = img ? 'visible' : 'hidden'
+	}
+}
+
+function disp_msg(msg, cl) {
+	var box = document.getElementById('msgbox')
+	box.innerHTML= "<div class='"+(cl || 'err_msg')+"'>"+ msg+'</div>';
+//	box.style.display = msg=='' ? 'none':'block';
+    if (msg!='') window.scrollTo(0,element_pos(box).y-10);
+}
+
 //
 //	JsHttpRequest class extensions.
 //
@@ -18,9 +33,14 @@
 //		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';
+JsHttpRequest.request= function(trigger, form, tout) {
+//	if (trigger.type=='submit' && !validate(trigger)) return false;
+	tout = tout | 3000;	// default timeout value
+	set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif');
+	JsHttpRequest._request(trigger, form, tout, 2);
+}
+
+JsHttpRequest._request = function(trigger, form, tout, retry) {
 		if (trigger.tagName=='A') {
 			var content = {};
 			var upload = 0;
@@ -41,12 +61,29 @@
 
 		if (!form) url = url.substring(0, url.indexOf('?'));
 		
-		if (!submitObj) 
+		if (!submitObj) {
 			content[trigger] = 1;
-			
+			}
 		}
 			// this is to avoid caching problems
 		content['_random'] = Math.random()*1234567;
+	
+		var tcheck = setTimeout(
+			function() {
+				for(var id in JsHttpRequest.PENDING)  {
+					var call = JsHttpRequest.PENDING[id];
+				 	if (call != false) {
+					if (call._ldObj.xr) // needed for gecko
+						call._ldObj.xr.onreadystatechange = function(){};
+					call.abort(); // why this doesn't kill request in firebug?
+//						call._ldObj.xr.abort();
+						delete JsHttpRequest.PENDING[id];
+					}
+				}
+				set_mark(retry ? 'ajax-loader2.gif':'warning.png' );
+				if(retry)
+					JsHttpRequest._request(trigger, form, tout, retry-1);
+			}, tout );
 
         JsHttpRequest.query(
             (upload ? "form." : "")+"POST "+url, // force form loader
@@ -91,11 +128,11 @@
 				  errors = errors+'<br>Unknown ajax function: '+cmd;
 			}
 		  }
-
+		 if(tcheck)
+		   JsHttpRequest.clearTimeout(tcheck);
         // Write errors to the debug div.
 		  document.getElementById('msgbox').innerHTML = errors;
-		  var mark = document.getElementById('ajaxmark');
-		  if(mark) mark.style.visibility = 'hidden';
+		  set_mark();
 
 		  Behaviour.apply();
 
@@ -108,9 +145,9 @@
 			}
 		}
             },
-            false  // do not disable caching
+	        false  // do not disable caching
         );
-    }
+	}
 	// collect all form input values plus inp trigger value
 	JsHttpRequest.formInputs = function(inp, objForm, upload)
 	{
@@ -118,9 +155,7 @@
 		var q = {};
 
 		if (typeof(inp) == "string")
-			submitObj = document.getElementsByName(inp)[0];
-		else
-			submitObj = inp;
+			submitObj = document.getElementsByName(inp)[0]||inp;
 		
 		objForm = objForm || (submitObj && submitObj.form);
 
@@ -197,9 +232,11 @@ function price_format(post, num, dec, label, color) {
 
 function get_amount(doc, label) {
 	    if(label)
-		var val = document.getElementById(doc).innerHTML;
+			var val = document.getElementById(doc).innerHTML;
 	    else
-		var val = document.getElementsByName(doc)[0].value;
+			var val = typeof(doc) == "string" ? 
+			document.getElementsByName(doc)[0].value : doc.value;
+		
 		val = val.replace(new RegExp('\\'+user.ts, 'g'),'');
 		val = +val.replace(new RegExp('\\'+user.ds, 'g'),'.');
 		return isNaN(val) ? 0 : val;