Stable merged into unstable again (due to failure on binary file during previous...

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

diff --git a/js/utils.js b/js/utils.js
index 51a7a491bfeedd96f7d9da8a12c4a560ba7358b5..cd416339e143dccfb65b69f4bdcbebb425e90e02 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -35,7 +35,7 @@ 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);
@@ -119,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);
+                                       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+'<br>Unknown ajax function: '+cmd;
                        }
@@ -171,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( 
@@ -195,6 +198,9 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
                                                }
                                        }
                                        else
+                                       if (el.type=='file')
+                                               q[name] = el
+                                       else
                                        {
                                                q[name] = el.value;
                                        }
@@ -213,12 +219,12 @@ function price_format(post, num, dec, label, color) {
                num = "0";
        sign = (num == (num = Math.abs(num)));
        var max = dec=='max';
-       if(max) dec = 15 - Math.floor(Math.log(Math.abs(num)));
+       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; i<dec; i++){
                cents = "0"+cents;
        }
@@ -251,11 +257,11 @@ function get_amount(doc, label) {
                return isNaN(val) ? 0 : val;
 }
 
-function goBack() {
-       if (window.history.length <= 1)
+function goBack(deep) {
+       if (window.opener)
         window.close();
        else
-        window.history.go(-1);
+        window.history.go(deep || -1);
 }
 
 function setFocus(name, byId) {
@@ -346,4 +352,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
+}