Fixed maxprec formatting.

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

diff --git a/js/utils.js b/js/utils.js
index 1c66384bb03d663fd18c3ab037fac41c2efd6bc9..9b1b1ac479202cbb08e91cf391aa09298c97a2c9 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -8,6 +8,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+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'
+       }
+}
+
+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);
+}
+
 //
 //     JsHttpRequest class extensions.
 //
@@ -18,9 +33,15 @@
 //             if form parameter exists also form values are submited, otherwise
 //             request is directed to current location 
 // 
-    JsHttpRequest.request= function(trigger, form) {
-               var mark = document.getElementById('ajaxmark');
-               if(mark) mark.style.visibility = 'visible';
+JsHttpRequest.request= function(trigger, form, tout) {
+//     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;
@@ -41,12 +62,29 @@
 
                if (!form) url = url.substring(0, url.indexOf('?'));
                
-               if (!submitObj) 
+               if (!submitObj) {
                        content[trigger] = 1;
-                       
+                       }
                }
                        // this is to avoid caching problems
                content['_random'] = Math.random()*1234567;
+       
+               var tcheck = setTimeout(
+                       function() {
+                               for(var id in JsHttpRequest.PENDING)  {
+                                       var call = JsHttpRequest.PENDING[id];
+                                       if (call != false) {
+                                       if (call._ldObj.xr) // needed for gecko
+                                               call._ldObj.xr.onreadystatechange = function(){};
+                                       call.abort(); // why this doesn't kill request in firebug?
+//                                             call._ldObj.xr.abort();
+                                               delete JsHttpRequest.PENDING[id];
+                                       }
+                               }
+                               set_mark(retry ? 'ajax-loader2.gif':'warning.png' );
+                               if(retry)
+                                       JsHttpRequest._request(trigger, form, tout, retry-1);
+                       }, tout );
 
         JsHttpRequest.query(
             (upload ? "form." : "")+"POST "+url, // force form loader
@@ -67,7 +105,7 @@
                        // 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) {
@@ -91,11 +129,11 @@
                                  errors = errors+'<br>Unknown ajax function: '+cmd;
                        }
                  }
-
+                if(tcheck)
+                  JsHttpRequest.clearTimeout(tcheck);
         // Write errors to the debug div.
                  document.getElementById('msgbox').innerHTML = errors;
-                 var mark = document.getElementById('ajaxmark');
-                 if(mark) mark.style.visibility = 'hidden';
+                 set_mark();
 
                  Behaviour.apply();
 
@@ -108,9 +146,9 @@
                        }
                }
             },
-            false  // do not disable caching
+               false  // do not disable caching
         );
-    }
+       }
        // collect all form input values plus inp trigger value
        JsHttpRequest.formInputs = function(inp, objForm, upload)
        {
@@ -147,10 +185,13 @@
                                {
                                        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
@@ -171,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
@@ -195,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;