X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=3ed5e314546cb0c744eeba59d8242a201e6f0351;hb=efc1a9ce400be6233323af9c193ab9460407bcf6;hp=a6d08dd952c70fe8e264c81a6f9828d1f8f2b340;hpb=f1e793b356fd4d526eafc66073302e584ede78a7;p=fa-stable.git diff --git a/js/inserts.js b/js/inserts.js index a6d08dd9..3ed5e314 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -53,8 +53,9 @@ function _set_combo_input(e) { save_focus(select); // submit request if there is submit_on_change option set and // search field has changed. + if (button && (this.value != this.getAttribute('_last'))) { - JsHttpRequest.request(button); + JsHttpRequest.request(button); } else if(this.className=='combo2') { this.style.display = 'none'; select.style.display = 'inline'; @@ -95,8 +96,10 @@ function _update_box(s) { if(box && s.selectedIndex>=0) { var opt = s.options[s.selectedIndex]; if(box) { + var old = box.value; box.value = byid ? opt.value : opt.text; box.setAttribute('_last', box.value); + return old != box.value } } } @@ -107,10 +110,13 @@ function _set_combo_select(e) { // signaling we must track selectedIndex in onblur handler. e.setAttribute('_last', e.selectedIndex); e.onblur = function() { - if(this.className=='combo') - _update_box(this); - if (this.selectedIndex != this.getAttribute('_last')) - this.onchange(); + var box = document.getElementsByName(this.getAttribute('rel'))[0]; +// if(this.className=='combo') +// _update_box(this); + if ((this.selectedIndex != this.getAttribute('_last')) + ||(this.className=='combo' && _update_box(this)) + ) + this.onchange(); } e.onchange = function() { var s = this; @@ -137,15 +143,39 @@ function _set_combo_select(e) { setFocus(box); return false; } - if (this.getAttribute('aspect') == 'editable' && key==115) { - // F4: call related database editor - not available in non-js fallback mode - JsHttpRequest.request('_'+this.name+'_editor', this.form); - return false; // prevent default binding - // TODO: stopPropagation when needed - } } } +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 :/ + _w = open(editors[key][0]+el.value+'&popup=1', + "edit","Scrollbars=0,resizable=0,width=800,height=600"); + if (_w.opener == null) + _w.opener = self; + editors._call = key; // store call point for passBack + _w.focus(); +} + +function passBack(value) { + var o = opener; + if(value != false) { + var back = o.editors[o.editors._call]; // form input bindings + var to = o.document.getElementsByName(back[1])[0]; + if (to) { + if (to[0] != undefined) + to[0].value = value; // ugly hack to set selector to any value + to.value = value; + // update page after item selection + o.JsHttpRequest.request('_'+to.name+'_update', to.form); + o.setFocus(to.name); + } + } + close(); +} + /* Behaviour definitions */ @@ -190,18 +220,18 @@ var inserts = { e.onclick = function() { save_focus(e); if (e.getAttribute('aspect') == 'process') - JsHttpRequest.request(this, null, 30000); + JsHttpRequest.request(this, null, 60000); else JsHttpRequest.request(this); return false; } }, -/* 'button': function(e) { + 'button': function(e) { if (e.name) { var func = _validate[e.name]; var old = e.onclick; - if(func) { - if (typeof old != 'function') { + if(func) { + if (typeof old != 'function' || old == func) { // prevent multiply binding on ajax update e.onclick = func; } else { e.onclick = function() { @@ -214,7 +244,7 @@ var inserts = { } } }, -*/ '.amount': function(e) { + '.amount': function(e) { if(e.onblur==undefined) { e.onblur = function() { var dec = this.getAttribute("dec"); @@ -233,7 +263,30 @@ var inserts = { 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')); + return false; + } + }, + 'button[aspect=popup]': function(e) { + var old = e.onclick + e.onclick = function() { +// this.form.target = '_blank'; +// old(); +// return true; + if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/ + _w = open(document.location+'popup=1', + "edit","Scrollbars=0,resizable=0,width=800,height=600, top=50,left=50"); + if (_w.opener == null) + _w.opener = self; + // editors._call = key; // store call point for passBack +// _w.moveTo(50, 50); + _w.focus(); + return false; + } + }, 'select': function(e) { if(e.onfocus==undefined) { e.onfocus = function() { @@ -244,17 +297,6 @@ var inserts = { _set_combo_select(e); } }, - 'textarea,a': function(e) { - if(e.onfocus==undefined) { - e.onfocus = function() { - save_focus(this); - }; - e.onmouseover = function(e) { - setFocus(this); - return false; - } - } - }, 'a.printlink': function(l) { l.onclick = function() { save_focus(this); @@ -286,7 +328,7 @@ var inserts = { } } } - }, + } /* 'tr.editrow': function(e) { e.onkeydown = function(ev) { ev = ev||window.event; @@ -313,10 +355,16 @@ var inserts = { } */ }; + function stopEv(ev) { - ev.returnValue = false; - ev.cancelBubble = true; - if(ev.preventDefault) ev.preventDefault(); + if(ev.preventDefault) { + ev.preventDefault(); + ev.stopPropagation(); + } else { + ev.returnValue = false; + ev.cancelBubble = true; + window.keycode = 0; + } return false; } /* @@ -332,7 +380,7 @@ function setHotKeys() { _hotkeys.focus = -1; return stopEv(ev); } - else if (_hotkeys.alt && ((key>47 && key<58) || (key>64 && key<91))) { + else if (ev.altKey && !ev.ctrlKey && ((key>47 && key<58) || (key>64 && key<91))) { var n = _hotkeys.focus; var l = document.links; var cnt = l.length; @@ -361,6 +409,11 @@ function setHotKeys() { for (var i=0; i=0) {