X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=e01c806a5f35407c0b311455706e44896441a209;hb=a0a0a0e1318042034fe5652caa69b034200c8a90;hp=8bc0a497248668c1cbafe89cf9683fc547d22079;hpb=421f94c8ad0b225c88bb3ca7ddeb6e513dc31050;p=fa-stable.git
diff --git a/js/inserts.js b/js/inserts.js
index 8bc0a497..e01c806a 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -11,24 +11,10 @@
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
};
-function debug(msg) {
- box = document.getElementById('msgbox')
- box.innerHTML= box.innerHTML+'
'+msg
-}
-
-function progbar() {
- box = document.getElementById('msgbox');
- box.innerHTML= "
"
- +""
- +" |
";
- box.style.display = 'block';
-}
-
function save_focus(e) {
_focus = e.name||e.id;
var h = document.getElementById('hints');
@@ -41,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")){
@@ -68,12 +54,13 @@ 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';
- setFocus(select.name);
+ setFocus(select);
}
return false;
};
@@ -110,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
}
}
}
@@ -122,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;
@@ -149,42 +141,46 @@ function _set_combo_select(e) {
this.style.display = 'none';
box.style.display = 'inline';
box.value='';
- setFocus(box.name);
+ 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
*/
var inserts = {
- 'form': function(e) {
- e.onkeydown = function(ev) {
- ev = ev||window.event;
- key = ev.keyCode||ev.which;
- if((ev.ctrlKey && key == 13) || key == 27) {
- ev.cancelBubble = true;
- if(ev.stopPropagation) ev.stopPropagation();
- // activate submit/escape form
- for (var i=0; i47 && 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];
- if (link.target=='_blank') {
-// window.open(link.href,'','toolbar=no,scrollbar=no,resizable=yes,menubar=no,width=900,height=500');
- openWindow(link.href,'_blank');
- } else
- window.location = link.href;
+ var link = _hotkeys.list[_hotkeys.focus];
+ if(link.onclick)
+ link.onclick();
+ else
+ if (link.target=='_blank') {
+ window.open(link.href,'','toolbar=no,scrollbar=no,resizable=yes,menubar=no,width=900,height=500');
+ openWindow(link.href,'_blank');
+ } else
+ window.location = link.href;
}
- }
return stopEv(ev);
+ }
}
return true;
}
}
-
+
Behaviour.register(inserts);
Behaviour.addLoadEvent(setFocus);