Additional corrections to latest js changes.

[fa-stable.git] / js / inserts.js

diff --git a/js/inserts.js b/js/inserts.js
index a1640de0c60c18b458747f96e3504d6ddb25e234..6883f7a102345283a9b9072021321c1115988506 100644 (file)
--- 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+'<br>'+msg
 }
 
-function progbar() {
-       box = document.getElementById('msgbox');
-    box.innerHTML= "<center><table width='98%' border='1' cellpadding=3 "
-       +"bordercolor='#007700' style='border-collapse: collapse'>"
-       +"<tr><td align='center' bgcolor='#ccffcc' >"
-               +"<img src='"+user.theme+"images/progressbar.gif' alt='"
-               +user.loadtxt+"' /></td></tr></table></center><br>";
-       box.style.display = 'block';
-}
-
 function save_focus(e) {
   _focus = e.name||e.id;
   var h = document.getElementById('hints');
@@ -215,15 +206,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) {
@@ -355,14 +365,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;
        }