X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=4d665e843fbe8b6a73353a745a4cbe16ec7ed96b;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=a6d08dd952c70fe8e264c81a6f9828d1f8f2b340;hpb=f1e793b356fd4d526eafc66073302e584ede78a7;p=fa-stable.git diff --git a/js/inserts.js b/js/inserts.js index a6d08dd9..4d665e84 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -137,15 +137,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 */ @@ -196,12 +220,12 @@ var inserts = { 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 +238,7 @@ var inserts = { } } }, -*/ '.amount': function(e) { + '.amount': function(e) { if(e.onblur==undefined) { e.onblur = function() { var dec = this.getAttribute("dec"); @@ -233,7 +257,13 @@ var inserts = { JsHttpRequest.request('_'+this.name+'_changed', this.form); } } - }, + }, + 'button[aspect=selector], input[aspect=selector]': function(e) { + e.onclick = function() { + passBack(this.getAttribute('rel')); + return false; + } + }, 'select': function(e) { if(e.onfocus==undefined) { e.onfocus = function() { @@ -244,17 +274,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); @@ -314,9 +333,14 @@ 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; } /* @@ -361,6 +385,11 @@ function setHotKeys() { for (var i=0; i