X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=e01c806a5f35407c0b311455706e44896441a209;hb=0830a5734b9a9b057e624c66a58574101d0965e1;hp=dd78a9f607be68de748e56c8bfde841f26093e8a;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git
diff --git a/js/inserts.js b/js/inserts.js
index dd78a9f6..e01c806a 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -11,14 +11,9 @@
var _focus;
var _hotkeys = {
'alt': false, // whether is the Alt key pressed
- 'focus': -1 // currently selected indeks of document.links
+ 'list': false, // list of all elements with hotkey used recently
+ 'focus': -1 // currently selected list element
};
-var _validate = {}; // validation functions
-
-function debug(msg) {
- box = document.getElementById('msgbox')
- box.innerHTML= box.innerHTML+'
'+msg
-}
function save_focus(e) {
_focus = e.name||e.id;
@@ -32,7 +27,7 @@ function save_focus(e) {
function _expand(tabobj) {
var ul = tabobj.parentNode.parentNode;
- var alltabs=ul.getElementsByTagName("input");
+ var alltabs=ul.getElementsByTagName("button");
var frm = tabobj.form;
if (ul.getAttribute("rel")){
@@ -59,8 +54,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';
@@ -101,8 +97,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
}
}
}
@@ -113,10 +111,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;
@@ -143,15 +144,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
*/
@@ -195,10 +220,10 @@ var inserts = {
function(e) {
e.onclick = function() {
save_focus(e);
- if (e.getAttribute('aspect') == 'process')
- JsHttpRequest.request(this, null, 30000);
- else
- JsHttpRequest.request(this);
+ if (e.getAttribute('aspect') == 'process')
+ JsHttpRequest.request(this, null, 60000);
+ else
+ JsHttpRequest.request(this);
return false;
}
},
@@ -206,8 +231,8 @@ var inserts = {
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() {
@@ -239,7 +264,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() {
@@ -250,17 +298,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);
@@ -282,17 +319,17 @@ var inserts = {
'ul.ajaxtabs': function(ul) {
var ulist=ul.getElementsByTagName("li");
for (var x=0; x47 && key<58) || (key>64 && key<91))) {
+ else if (ev.altKey && !ev.ctrlKey && ((key>47 && key<58) || (key>64 && key<91))) {
+ key = String.fromCharCode(key);
var n = _hotkeys.focus;
- var l = document.links;
+ var l = document.getElementsBySelector('[accesskey='+key+']');
var cnt = l.length;
- key = String.fromCharCode(key);
+ _hotkeys.list = l;
for (var i=0; i=0) {
- var link = document.links[_hotkeys.focus];
+ var link = _hotkeys.list[_hotkeys.focus];
if(link.onclick)
link.onclick();
else