X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=a6d08dd952c70fe8e264c81a6f9828d1f8f2b340;hb=90c08330ed36df13b13b7bf8577a70699acf85d3;hp=0c0067fdfcd2486315717f544c6fc09f500656e1;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git
diff --git a/js/inserts.js b/js/inserts.js
index 0c0067fd..a6d08dd9 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -11,24 +11,9 @@
var _focus;
var _hotkeys = {
'alt': false, // whether is the Alt key pressed
- 'focus': -1 // currently selected indeks of document.links
+ 'focus': -1 // currently selected indeks of document.links
};
-function debug(msg) {
- box = document.getElementById('msgbox')
- box.innerHTML= box.innerHTML+'
'+msg
-}
-
-function progbar() {
- box = document.getElementById('msgbox');
- box.innerHTML= "
"
- +""
- +"!["
- +user.loadtxt+"]("+user.theme+"images/progressbar.gif) |
";
- box.style.display = 'block';
-}
-
function save_focus(e) {
_focus = e.name||e.id;
var h = document.getElementById('hints');
@@ -73,7 +58,7 @@ function _set_combo_input(e) {
} else if(this.className=='combo2') {
this.style.display = 'none';
select.style.display = 'inline';
- setFocus(select.name);
+ setFocus(select);
}
return false;
};
@@ -149,7 +134,7 @@ 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) {
@@ -165,20 +150,6 @@ function _set_combo_select(e) {
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();
-// here ctrl-enter/escape support
- ev.returnValue = false;
- return false;
- }
- return true;
- }
- },
'input': function(e) {
if(e.onfocus==undefined) {
e.onfocus = function() {
@@ -214,17 +185,36 @@ var inserts = {
e.style.display = 'block';
},
// '.ajaxsubmit,.editbutton,.navibutton': // much slower on IE7
- 'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.navibutton':
+ 'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.editbutton,button.navibutton':
function(e) {
- e.onclick = function() {
- if (this.getAttribute('aspect') == 'process')
- progbar();
- save_focus(this);
- JsHttpRequest.request(this);
- return false;
- }
+ e.onclick = function() {
+ save_focus(e);
+ if (e.getAttribute('aspect') == 'process')
+ JsHttpRequest.request(this, null, 30000);
+ else
+ JsHttpRequest.request(this);
+ return false;
+ }
},
- '.amount': function(e) {
+/* 'button': function(e) {
+ if (e.name) {
+ var func = _validate[e.name];
+ var old = e.onclick;
+ if(func) {
+ if (typeof old != 'function') {
+ e.onclick = func;
+ } else {
+ e.onclick = function() {
+ if(func())
+ { old(); return true;}
+ else
+ return false;
+ }
+ }
+ }
+ }
+ },
+*/ '.amount': function(e) {
if(e.onblur==undefined) {
e.onblur = function() {
var dec = this.getAttribute("dec");
@@ -243,15 +233,7 @@ var inserts = {
JsHttpRequest.request('_'+this.name+'_changed', this.form);
}
}
-/* e.onkeydown = function(ev) {
- ev = ev||window.event;
- key = ev.keyCode||ev.which;
- if (key == 13 && (this.value != this.getAttribute('_last_val'))) {
- this.blur();
- return false;
- }
- }
-*/ },
+ },
'select': function(e) {
if(e.onfocus==undefined) {
e.onfocus = function() {
@@ -267,6 +249,10 @@ var inserts = {
e.onfocus = function() {
save_focus(this);
};
+ e.onmouseover = function(e) {
+ setFocus(this);
+ return false;
+ }
}
},
'a.printlink': function(l) {
@@ -276,6 +262,17 @@ var inserts = {
return false;
}
},
+ 'a': function(e) { // traverse menu
+ e.onkeydown = function(ev) {
+ ev = ev||window.event;
+ key = ev.keyCode||ev.which;
+ if(key==37 || key==38 || key==39 || key==40) {
+ move_focus(key, e, document.links);
+ ev.returnValue = false;
+ return false;
+ }
+ }
+ },
'ul.ajaxtabs': function(ul) {
var ulist=ul.getElementsByTagName("li");
for (var x=0; x47 && key<58) || (key>64 && key<91))) {
var n = _hotkeys.focus;
var l = document.links;
@@ -345,6 +350,27 @@ function setHotKeys() {
}
return stopEv(ev);
}
+ if((ev.ctrlKey && key == 13) || key == 27) {
+ _hotkeys.alt = false; // cancel link selection
+ _hotkeys.focus = -1;
+ ev.cancelBubble = true;
+ if(ev.stopPropagation) ev.stopPropagation();
+ // activate submit/escape form
+ for(var j=0; j=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;
+ 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;
}