X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=3448c86949691da79ffa36722467b7e72b8caadc;hb=f6f02cc789c66c6807fb612ae02a6908f46e60f9;hp=a4181a1b5ac42ba19df74e1a58a940ab269cc9eb;hpb=bf56441e7b863ce1d8b0b20790b7f10c703cc8dd;p=fa-stable.git diff --git a/js/inserts.js b/js/inserts.js index a4181a1b..3448c869 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -228,11 +228,32 @@ function fix_date(date, last) day = dat[0]; month = dat[1]; year = dat[2]; } else { day = dat[2]; month = dat[1]; year = dat[0]; - } - if (cur[0] != undefined && cur[0] != "") // day entered - day = cur[0]; - if (cur[1] != undefined && cur[1] != "") // month entered - month = cur[1]; + } + if (cur[1] != undefined && cur[1] != "") // day or month entered, could be string 3 + { + if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == ""))) + day = cur[1]; + else + month = cur[1]; + } + if (cur[0] != undefined && cur[0] != "") // day or month entered. could be string 3 + { + if (cur[1] == undefined || cur[1] == "") + day = cur[0]; + else if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == ""))) + month = cur[0]; + else if (user.datefmt == 2 || user.datefmt == 5) + year = cur[0]; + else + day = cur[0]; + } + if (cur[2] != undefined && cur[2] != "") // year, + { + if (user.datefmt == 2 || user.datefmt == 5) + day = cur[2]; + else + year = cur[2]; + } if (user.datefmt<3) { if (day<10) day = '0'+parseInt(day, 10); if (month<10) month = '0'+parseInt(month, 10); @@ -433,7 +454,9 @@ var inserts = { ev.returnValue = false; return false; } - window.location = e.href; + if (_hotkeys.alt) // ommit Chrome accesskeys + return false; + window.location = e.href; } }, 'ul.ajaxtabs': function(ul) { @@ -444,7 +467,8 @@ var inserts = { // ? var modifiedurl=ulistlink.getAttribute("href").replace(/^http:\/\/[^\/]+\//i, "http://"+window.location.hostname+"/") var url = tab.form.action tab.onclick=function(){ - _expand(this); + if (!_hotkeys.alt && !tab.disabled) + _expand(this); return false; } } @@ -517,7 +541,7 @@ function setHotKeys() { for (var i=0; i