Fixed maxprec formatting.

[fa-stable.git] / js / utils.js

diff --git a/js/utils.js b/js/utils.js
index d051b10f1a900a1a9d1bb4e478cbfe218b7f4715..9b1b1ac479202cbb08e91cf391aa09298c97a2c9 100644 (file)
--- 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= "<div class='"+(cl || 'err_msg')+"'>"+ msg+'</div>';
+//     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;
@@ -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) {
@@ -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
@@ -199,19 +212,25 @@ 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 = 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();
-       for( i=cents.toString().length; i<dec; i++){
-               cents = "0" + cents;
-       }
+       if (max) // strip trailing 0
+               cents = cents.toString().replace(/0+$/,'');
+       else
+               for( i=cents.toString().length; i<dec; i++){
+                       cents = cents + "0";
+               }
        for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
                num = num.substring(0,num.length-(4*i+3))+user.ts+
                        num.substring(num.length-(4*i+3));
         num = ((sign)?'':'-') + num;
-        if(dec!=0) num = num + user.ds + cents;
+       if(dec!=0 && (!max || cents!=0))
+               num = num + user.ds + cents;
        if(label)
            el.innerHTML = num;
        else
@@ -223,9 +242,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;