X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=c5aec13332dea4100dd439ad3cd98f7f5225249b;hb=c81440fdf91c294d4dc4778cfeccde5d10101faa;hp=761378e4c4ddcf22df2f371d7414ae50559616be;hpb=a1c1f11e18aa72599123c36521a54a21a2c3d0bc;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index 761378e4..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);
@@ -39,7 +39,7 @@ JsHttpRequest.request= function(trigger, form, tout) {
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,7 +119,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
} else if(cmd=='fc') { // set focus
_focus = data;
} else if(cmd=='js') { // evaluate js code
- __isGecko ? eval(data) : setTimeout(function(){eval(data)}, 200); // timeout required by IE7/8
+ __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
@@ -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)
{
@@ -173,7 +173,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
// (internally form is submitted via form.submit() not button click())
if (submitObj.type=='submit' && el==submitObj)
{
- q[name] = el.value
+ q[name] = el.value;
continue;
}
}
@@ -199,7 +199,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
}
else
if (el.type=='file')
- q[name] = el
+ q[name] = el;
else
{
q[name] = el.value;
@@ -208,7 +208,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
}
}
return q;
- }
+ };
//
// User price formatting
//
@@ -265,7 +265,7 @@ function goBack(deep) {
}
function setFocus(name, byId) {
-
+ var el = null;
if(typeof(name)=='object')
el = name;
else {
@@ -278,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