X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=cd416339e143dccfb65b69f4bdcbebb425e90e02;hb=def96b1b92e66a1c6a146c84d086690914df42ea;hp=ca365f5d3680bcae47a2cd4f800ca2dd7dc7e98d;hpb=dc3ea18e9a7fa55826d590d73ed3a7215e34172a;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index ca365f5d..cd416339 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -35,7 +35,8 @@ function disp_msg(msg, cl) {
//
JsHttpRequest.request= function(trigger, form, tout) {
// if (trigger.type=='submit' && !validate(trigger)) return false;
- tout = tout | 6000; // default timeout value
+ 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);
}
@@ -104,7 +105,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
// 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) {
@@ -118,12 +119,12 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
} else if(cmd=='fc') { // set focus
_focus = data;
} else if(cmd=='js') { // evaluate js code
- 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;
}
@@ -170,8 +171,11 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
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(
@@ -194,6 +198,9 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
}
}
else
+ if (el.type=='file')
+ q[name] = el
+ else
{
q[name] = el.value;
}
@@ -211,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);
@@ -339,4 +352,4 @@ function element_pos(e) {
// parentNode has style.display set to none
if (parentNode != document.documentElement) return null;
return res;
-}
\ No newline at end of file
+}