X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=js%2Finserts.js;h=dd78a9f607be68de748e56c8bfde841f26093e8a;hb=89cb648e9d031fa624e7814f89e90ccba2042124;hp=1026fbf623276bfec5a80ef8cb6d0e0235890a38;hpb=4415553f170c38216804b08de6ce383f1e61d6b8;p=fa-stable.git
diff --git a/js/inserts.js b/js/inserts.js
index 1026fbf6..dd78a9f6 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -13,22 +13,13 @@ var _hotkeys = {
'alt': false, // whether is the Alt key pressed
'focus': -1 // currently selected indeks of document.links
};
+var _validate = {}; // validation functions
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');
@@ -200,15 +191,34 @@ 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;
+ }
+ },
+ '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) {
@@ -378,14 +388,17 @@ function setHotKeys() {
_hotkeys.alt = false;
if (_hotkeys.focus>=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;
}