X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=c5aec13332dea4100dd439ad3cd98f7f5225249b;hb=c81440fdf91c294d4dc4778cfeccde5d10101faa;hp=ca365f5d3680bcae47a2cd4f800ca2dd7dc7e98d;hpb=dc3ea18e9a7fa55826d590d73ed3a7215e34172a;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index ca365f5d..c5aec133 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -12,12 +12,12 @@ 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'
+ box.style.visibility = img ? 'visible' : 'hidden';
}
}
function disp_msg(msg, cl) {
- var box = document.getElementById('msgbox')
+ var box = document.getElementById('msgbox');
box.innerHTML= "
"+ msg+'
';
// box.style.display = msg=='' ? 'none':'block';
if (msg!='') window.scrollTo(0,element_pos(box).y-10);
@@ -35,10 +35,11 @@ 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);
-}
+};
JsHttpRequest._request = function(trigger, form, tout, retry) {
if (trigger.tagName=='A') {
@@ -54,7 +55,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
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);
@@ -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);
+ __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;
}
@@ -147,7 +148,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
},
false // do not disable caching
);
- }
+ };
// collect all form input values plus inp trigger value
JsHttpRequest.formInputs = function(inp, objForm, upload)
{
@@ -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;
}
@@ -201,7 +208,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
}
}
return q;
- }
+ };
//
// User price formatting
//
@@ -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);
@@ -304,7 +318,7 @@ function move_focus(dir, e0, neighbours)
return t;
}
-var __isFireFox = navigator.userAgent.match(/gecko/i);
+var __isGecko = navigator.userAgent.match(/gecko/i); // i.e. Gecko or KHTML, like Gecko ;)
//returns the absolute position of some element within document
function element_pos(e) {
var res = new Object();
@@ -324,7 +338,7 @@ function element_pos(e) {
res.y -= offsetParent.scrollTop;
}
//next lines are necessary to support FireFox problem with offsetParent
- if (__isFireFox) {
+ if (__isGecko) {
while (offsetParent != parentNode && parentNode !== null) {
res.x -= parentNode.scrollLeft;
res.y -= parentNode.scrollTop;
@@ -339,4 +353,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
+}