X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=js%2Futils.js;h=8d707b3dd01682212d6add3644cc0e21f4dfa690;hb=29e68a1b8dcbe7c7ecb797396945e0cccf2d6cd8;hp=d051b10f1a900a1a9d1bb4e478cbfe218b7f4715;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index d051b10f..8d707b3d 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 | 6000; // 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;
@@ -175,10 +185,13 @@ 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
@@ -223,9 +236,11 @@ function price_format(post, num, dec, label, color) {
function get_amount(doc, label) {
if(label)
- var val = document.getElementById(doc).innerHTML;
+ var val = document.getElementById(doc).innerHTML;
else
- var val = document.getElementsByName(doc)[0].value;
+ var val = typeof(doc) == "string" ?
+ document.getElementsByName(doc)[0].value : doc.value;
+
val = val.replace(new RegExp('\\'+user.ts, 'g'),'');
val = +val.replace(new RegExp('\\'+user.ds, 'g'),'.');
return isNaN(val) ? 0 : val;