X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=c5aec13332dea4100dd439ad3cd98f7f5225249b;hb=161817d815272a13859c37f7d37a9aa8c3de85ae;hp=98733d667d84f2542f72b59f3d5f1f1e4d99b23d;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/js/utils.js b/js/utils.js index 98733d66..c5aec133 100644 --- a/js/utils.js +++ b/js/utils.js @@ -8,6 +8,21 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ +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= "
"+ msg+'
'; +// box.style.display = msg=='' ? 'none':'block'; + if (msg!='') window.scrollTo(0,element_pos(box).y-10); +} + // // JsHttpRequest class extensions. // @@ -18,9 +33,15 @@ // 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 || 10000; // default timeout value + document.getElementById('msgbox').innerHTML=''; + set_mark(tout>10000 ? 'progressbar.gif' : 'ajax-loader.gif'); + JsHttpRequest._request(trigger, form, tout, 0); +}; + +JsHttpRequest._request = function(trigger, form, tout, retry) { if (trigger.tagName=='A') { var content = {}; var upload = 0; @@ -34,19 +55,36 @@ var upload = form && form.enctype=='multipart/form-data'; - var url = form ? form.action : + var url = form ? form.getAttribute('action') : window.location.toString(); var content = this.formInputs(trigger, form, upload); 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 @@ -67,7 +105,7 @@ // 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.setAttribute('"+property+"',"+data+");"); + eval("objElement.setAttribute('"+property+"','"+data+"');"); } else if(cmd=='up') { // if(!objElement) alert('No element "'+id+'"'); if(objElement) { @@ -81,21 +119,21 @@ } else if(cmd=='fc') { // set focus _focus = data; } else if(cmd=='js') { // evaluate js code - eval(data); + __isGecko ? eval(data) : setTimeout(function(){eval(data);}, 200); // timeout required by IE7/8 } 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'); + window.open(data,'REP_WINDOW','toolbar=no,scrollbars=yes,resizable=yes,menubar=no'); } else { errors = errors+'
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 +146,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 +156,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); @@ -135,8 +171,11 @@ 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 (submitObj.type=='submit' && el==submitObj) + { + q[name] = el.value; + continue; + } } if (el.type ) if( @@ -149,13 +188,19 @@ { if(el.type=='select-multiple') { + name = name.substr(0,name.length-2); + q[name] = new Array; for (var j = 0; j < el.length; j++) { + s = name.substring(0, name.length-2); if (el.options[j].selected == true) - q[name] = el.options[j].value; + q[name].push(el.options[j].value); } } else + if (el.type=='file') + q[name] = el; + else { q[name] = el.value; } @@ -163,7 +208,7 @@ } } return q; - } + }; // // User price formatting // @@ -173,19 +218,24 @@ function price_format(post, num, dec, label, color) { if(isNaN(num)) num = "0"; sign = (num == (num = Math.abs(num))); + var max = dec=='max'; + if(max) dec = num==0 ? 2 : 15 - Math.floor(Math.log(Math.abs(num))); if(dec<0) dec = 2; decsize = Math.pow(10, dec); num = Math.floor(num*decsize+0.50000000001); cents = num%decsize; - num = Math.floor(num/decsize).toString(); + num = Math.floor(num/decsize).toString(); for( i=cents.toString().length; ip0.y)) || (dir==38 && (p.yp0.x)))) { + var l1 = (p.y-p0.y)*(p.y-p0.y)+(p.x-p0.x)*(p.x-p0.x); + if ((l1