Fixed a bug so calling the popup items (f4) works when making PO, Direct GRN, Direct...

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

diff --git a/js/utils.js b/js/utils.js
index 898a536211086ff3cabb62a0f873395aa4cef698..761378e4c4ddcf22df2f371d7414ae50559616be 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);
+                               __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+'<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;
                                        }
@@ -311,7 +317,7 @@ function move_focus(dir, e0, neighbours)
        return t;
 }
 
-var __isFireFox = navigator.userAgent.match(/gecko/i);
+var __isGecko = navigator.userAgent.match(/gecko/i); // i.e. Gecko or KHTML, like Gecko ;)
 //returns the absolute position of some element within document
 function element_pos(e) {
        var res = new Object();
@@ -331,7 +337,7 @@ function element_pos(e) {
                                res.y -= offsetParent.scrollTop;
                        }
                              //next lines are necessary to support FireFox problem with offsetParent
-                       if (__isFireFox) {
+                       if (__isGecko) {
                                while (offsetParent != parentNode && parentNode !== null) {
                                        res.x -= parentNode.scrollLeft;
                                        res.y -= parentNode.scrollTop;
@@ -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
+}