X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=c5aec13332dea4100dd439ad3cd98f7f5225249b;hb=ec51d9a922df61d39de8444cd0a3aaf51ebcbf2b;hp=898a536211086ff3cabb62a0f873395aa4cef698;hpb=b5290bacccd3388d097dc01a2c6a2762b9ee4e57;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index 898a5362..c5aec133 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -12,12 +12,12 @@ 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'
+ box.style.visibility = img ? 'visible' : 'hidden';
}
}
function disp_msg(msg, cl) {
- var box = document.getElementById('msgbox')
+ var box = document.getElementById('msgbox');
box.innerHTML= "
"+ msg+'
';
// box.style.display = msg=='' ? 'none':'block';
if (msg!='') window.scrollTo(0,element_pos(box).y-10);
@@ -35,11 +35,11 @@ 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);
-}
+};
JsHttpRequest._request = function(trigger, form, tout, retry) {
if (trigger.tagName=='A') {
@@ -55,7 +55,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
var upload = form && form.enctype=='multipart/form-data';
- var url = form ? form.action :
+ var url = form ? form.getAttribute('action') :
window.location.toString();
var content = this.formInputs(trigger, form, upload);
@@ -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+'
Unknown ajax function: '+cmd;
}
@@ -148,7 +148,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
},
false // do not disable caching
);
- }
+ };
// collect all form input values plus inp trigger value
JsHttpRequest.formInputs = function(inp, objForm, upload)
{
@@ -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;
}
@@ -202,7 +208,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
}
}
return q;
- }
+ };
//
// User price formatting
//
@@ -259,7 +265,7 @@ function goBack(deep) {
}
function setFocus(name, byId) {
-
+ var el = null;
if(typeof(name)=='object')
el = name;
else {
@@ -272,10 +278,11 @@ function setFocus(name, byId) {
if(cur) name = cur.value;
}
}
- if(byId || !(el = document.getElementsByName(name)[0]))
- el = document.getElementById(name);
+ if (name)
+ if(byId || !(el = document.getElementsByName(name)[0]))
+ el = document.getElementById(name);
}
- if(el && el.focus) {
+ if (el != null && el.focus) {
// The timeout is needed to prevent unpredictable behaviour on IE & Gecko.
// Using tmp var prevents crash on IE5
@@ -311,7 +318,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 +338,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 +353,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
+}