X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=761378e4c4ddcf22df2f371d7414ae50559616be;hb=03dbf580a48b9831dfb6fcbf8c34e1315c26a99e;hp=b8055c997b83d40f3600f62b6c75f1a967e3532b;hpb=10dced7e75209f8158e4e1fa250bfbf91cfaa182;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index b8055c99..761378e4 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -10,8 +10,17 @@
***********************************************************************/
function set_mark(img) {
var box = document.getElementById('ajaxmark');
- if(img) box.src = user.theme+'images/'+ img;
- box.style.visibility = img ? 'visible' : 'hidden'
+ 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);
}
//
@@ -25,13 +34,14 @@ function set_mark(img) {
// request is directed to current location
//
JsHttpRequest.request= function(trigger, form, tout) {
- tout = tout | 3000; // default timeout value
- set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif');
- JsHttpRequest._request(trigger, form, tout, 2);
+// 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;
@@ -95,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) {
@@ -109,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;
}
@@ -146,9 +156,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
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);
@@ -163,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(
@@ -177,13 +188,19 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
{
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;
}
@@ -201,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