X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=3448c86949691da79ffa36722467b7e72b8caadc;hb=96ad9190fa3637a41b3161f5b99fc044cbe01867;hp=5110343e6b37b4ca8d7ce32ef4433f8eac3ba891;hpb=95a69c2506035fb3e300cdbd221cb979f403fc04;p=fa-stable.git diff --git a/js/inserts.js b/js/inserts.js index 5110343e..3448c869 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -18,6 +18,14 @@ var _hotkeys = { function validate(e) { if (e.name && (typeof _validate[e.name] == 'function')) return _validate[e.name](e); + else { + var n = e.name.indexOf('['); + if(n!=-1) { + var key = e.name.substring(n+1, e.name.length-1); + if (key.length>1 && _validate[e.name.substring(0,n)]) + return _validate[e.name.substring(0,n)][key](e); + } + } return true; } @@ -150,23 +158,32 @@ function _set_combo_select(e) { event = event||window.event; key = event.keyCode||event.which; var box = document.getElementsByName(this.getAttribute('rel'))[0]; - if (box && key == 32 && this.className == 'combo2') { + if(key == 8 || (key==37 && event.altKey)) { + event.returnValue = false; + return false; + } + if (box && (key == 32) && (this.className == 'combo2')) { this.style.display = 'none'; box.style.display = 'inline'; box.value=''; setFocus(box); return false; + } else { + if (key == 13 && !e.length) // prevent chrome issue (blocked cursor after CR on empty selector) + return false; } } -} +} var _w; function callEditor(key) { var el = document.getElementsByName(editors[key][1])[0]; if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/ + var left = (screen.width - editors[key][2]) / 2; + var top = (screen.height - editors[key][3]) / 2; _w = open(editors[key][0]+el.value+'&popup=1', - "edit","Scrollbars=0,resizable=0,width="+editors[key][2]+",height="+editors[key][3]); + "edit","scrollbars=yes,resizable=0,width="+editors[key][2]+",height="+editors[key][3]+",left="+left+",top="+top+",screenX="+left+",screenY="+top); if (_w.opener == null) _w.opener = self; editors._call = key; // store call point for passBack @@ -190,6 +207,67 @@ function passBack(value) { close(); } +/* + Normalize date format using previous input value to guess missing date elements. + Helps fast date input field change with only single or double numbers (for day or day-and-month fragments) +*/ +function fix_date(date, last) +{ + var dat = last.split(user.datesep); + var cur = date.split(user.datesep); + var day, month, year; + +// TODO: user.date as default? +// TODO: user.datesys + if (date == "" || date == last) // should we return an empty date or should we return last? + return date; + if (user.datefmt == 0 || user.datefmt == 3) // set defaults + { + day = dat[1]; month = dat[0]; year = dat[2]; + } else if (user.datefmt == 1 || user.datefmt == 4){ + day = dat[0]; month = dat[1]; year = dat[2]; + } else { + day = dat[2]; month = dat[1]; year = dat[0]; + } + 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); + } + if (year<100) year = year<60 ? (2000+parseInt(year,10)) : (1900+parseInt(year,10)); + +// console.info(day,month,year) + if (user.datefmt == 0 || user.datefmt==3) + return month+user.datesep+day+user.datesep+year; + if (user.datefmt == 1 || user.datefmt==4) + return day+user.datesep+month+user.datesep+year; + return year+user.datesep+month+user.datesep+day; +} + /* Behaviour definitions */ @@ -228,9 +306,24 @@ var inserts = { // this shows divs for js enabled browsers only e.style.display = 'block'; }, - 'button': function(e) { - e.onclick = function(){ return validate(e); } + e.onclick = function(){ + if (validate(e)) { + setTimeout(function() { var asp = e.getAttribute('aspect'); + set_mark((asp && (asp.indexOf('process') !== -1)) ? 'progressbar.gif' : 'ajax-loader.gif'); + }, 100); + return true; + } + }, + e.onkeydown = function(ev) { // block unintentional page escape with 'history back' key pressed on buttons + ev = ev||window.event; + key = ev.keyCode||ev.which; + if(key == 8 || (key==37 && ev.altKey)) { + ev.returnValue = false; + return false; + } + } + }, // '.ajaxsubmit,.editbutton,.navibutton': // much slower on IE7 'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.editbutton,button.navibutton': @@ -239,8 +332,8 @@ var inserts = { if (validate(e)) { save_focus(e); var asp = e.getAttribute('aspect') - if (asp && asp.indexOf('process') !== -1) - JsHttpRequest.request(this, null, 60000); + if (asp && (asp.indexOf('process') !== -1)) + JsHttpRequest.request(this, null, 600000); // ten minutes for backup else JsHttpRequest.request(this); } @@ -267,6 +360,20 @@ var inserts = { } } }, + '.date': + function(e) { + e.setAttribute('_last_val', e.value); + e.setAttribute('autocomplete', 'off'); + e.onblur = function() { + var val = this.getAttribute('_last_val'); + if (val != this.value) { + this.value = fix_date(this.value, val); + this.setAttribute('_last_val', this.value); + if (e.className.match(/\bactive\b/)) + JsHttpRequest.request('_'+this.name+'_changed', this.form); + } + } + }, 'button[aspect*selector], button[aspect*abort], input[aspect*selector]': function(e) { e.onclick = function() { passBack(this.getAttribute('rel')); @@ -276,8 +383,10 @@ var inserts = { 'button[aspect=popup]': function(e) { e.onclick = function() { if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/ + var left = (screen.width - 800)/2; + var top = (screen.height - 600)/2; _w = open(document.location+'popup=1', - "edit","Scrollbars=0,resizable=0,width=800,height=600, top=50,left=50"); + "edit","Scrollbars=0,resizable=0,width=800,height=600, top="+top+",left="+left+",screenX="+left+",screenY="+top); if (_w.opener == null) _w.opener = self; // editors._call = key; // store call point for passBack @@ -291,9 +400,19 @@ var inserts = { e.onfocus = function() { save_focus(this); }; - var c = e.className; - if (c == 'combo' || c == 'combo2' || c == 'combo3') + } + var c = e.className; + if (c == 'combo' || c == 'combo2' || c == 'combo3') _set_combo_select(e); + else { + e.onkeydown = function(ev) { // block unintentional page escape with 'history back' key pressed on buttons + ev = ev||window.event; + key = ev.keyCode||ev.which; + if(key == 8 || (key=37 && ev.altKey)) { + ev.returnValue = false; + return false; + } + } } }, 'a.printlink': function(l) { @@ -335,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) { @@ -346,13 +467,20 @@ 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; } } // } + }, + 'textarea': function(e) { + if(e.onfocus==undefined) { + e.onfocus = function() { + save_focus(this); + }; + } } - /* 'tr.editrow': function(e) { e.onkeydown = function(ev) { ev = ev||window.event; @@ -413,7 +541,7 @@ function setHotKeys() { for (var i=0; i