X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Futils.js;h=64a266d721951cd2f1752e7b73cad97dfd2cafe1;hb=ebc600101ceab69c06eac4b1bd4d1782af45de05;hp=b8055c997b83d40f3600f62b6c75f1a967e3532b;hpb=d48f1d6f613ffd8e7ab4fbc8840e0a8aab1ad3b6;p=fa-stable.git
diff --git a/js/utils.js b/js/utils.js
index b8055c99..64a266d7 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -10,8 +10,17 @@
***********************************************************************/
function set_mark(img) {
var box = document.getElementById('ajaxmark');
- if(img) box.src = user.theme+'images/'+ img;
- box.style.visibility = img ? 'visible' : 'hidden'
+ 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= "
"+ msg+'
';
+// box.style.display = msg=='' ? 'none':'block';
+ if (msg!='') window.scrollTo(0,element_pos(box).y-10);
}
//
@@ -25,13 +34,13 @@ function set_mark(img) {
// request is directed to current location
//
JsHttpRequest.request= function(trigger, form, tout) {
+// if (trigger.type=='submit' && !validate(trigger)) return false;
tout = tout | 3000; // default timeout value
set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif');
JsHttpRequest._request(trigger, form, tout, 2);
}
JsHttpRequest._request = function(trigger, form, tout, retry) {
-
if (trigger.tagName=='A') {
var content = {};
var upload = 0;
@@ -146,9 +155,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
var q = {};
if (typeof(inp) == "string")
- submitObj = document.getElementsByName(inp)[0];
- else
- submitObj = inp;
+ submitObj = document.getElementsByName(inp)[0]||inp;
objForm = objForm || (submitObj && submitObj.form);
@@ -177,10 +184,13 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
{
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
@@ -225,9 +235,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;
@@ -241,25 +253,22 @@ function goBack() {
}
function setFocus(name, byId) {
- if(document.location.pathname.indexOf('index.php') != -1) {
- // this is application menu page - set focus on first link
- // var el = document.getElementById('msgbox');
- // TODO find first link after msgbox and set focus
- }
- if(!name) {
- if (_focus)
- name = _focus; // last focus set in onfocus handlers
- else
- if (document.forms.length) { // no current focus (first page display) - set it from from last form
- var cur = document.getElementsByName('_focus')[document.forms.length-1];
- if(cur) name = cur.value;
- }
- }
- if(byId)
- el = document.getElementById(name);
- else
- el = document.getElementsByName(name)[0];
+ if(typeof(name)=='object')
+ el = name;
+ else {
+ if(!name) { // page load/ajax update
+ if (_focus)
+ name = _focus; // last focus set in onfocus handlers
+ else
+ if (document.forms.length) { // no current focus (first page display) - set it from from last form
+ var cur = document.getElementsByName('_focus')[document.forms.length-1];
+ if(cur) name = cur.value;
+ }
+ }
+ if(byId || !(el = document.getElementsByName(name)[0]))
+ el = document.getElementById(name);
+ }
if(el && el.focus) {
// The timeout is needed to prevent unpredictable behaviour on IE & Gecko.
// Using tmp var prevents crash on IE5
@@ -268,3 +277,66 @@ function setFocus(name, byId) {
setTimeout(tmp, 0);
}
}
+/*
+ Find closest element in neighbourhood and set focus.
+ dir is arrow keycode.
+*/
+function move_focus(dir, e0, neighbours)
+{
+ var p0 = element_pos(e0);
+ var t;
+ var l=0;
+ for(var i=0; ip0.y)) || (dir==38 && (p.yp0.x)))) {
+ var l1 = (p.y-p0.y)*(p.y-p0.y)+(p.x-p0.x)*(p.x-p0.x);
+ if ((l1