X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=fca82d03c069af2f8e1acaf82ab34caaeafd560d;hb=cb667e6d69ccd818ca1a10cff8a21a41dc3b4af5;hp=b2fc71c4b5bb83f1acb0c065d57b3684228eb638;hpb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;p=fa-stable.git diff --git a/js/utils.js b/js/utils.js index b2fc71c4..fca82d03 100644 --- a/js/utils.js +++ b/js/utils.js @@ -9,7 +9,14 @@ // 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; @@ -23,10 +30,12 @@ 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 + + } + // this is to avoid caching problems content['_random'] = Math.random()*1234567; JsHttpRequest.query( @@ -35,6 +44,7 @@ // 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]; @@ -62,6 +72,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+'
Unknown ajax function: '+cmd; } @@ -69,13 +82,18 @@ // 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