X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=a6d08dd952c70fe8e264c81a6f9828d1f8f2b340;hb=90c08330ed36df13b13b7bf8577a70699acf85d3;hp=156882bf27891c43a254568ea6911568940928a3;hpb=3dc7f60a71b28453a8318c1d4b23b94a090f2171;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index 156882bf..a6d08dd9 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -14,21 +14,6 @@ var _hotkeys = {
 	'focus': -1		// currently selected indeks of document.links
 };
 
-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');
@@ -165,26 +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();
-				// activate submit/escape form
-				for (var i=0; i<this.elements.length; i++){
-					var asp = this.elements[i].getAttribute('aspect');
-					if ((asp=='default' && key==13)||(asp=='cancel' && key==27))
-						JsHttpRequest.request(this.elements[i]);
-				}
-			
-				ev.returnValue = false;
-				return false;
-			} 
-			return true;
-	  	}
-	},
 	'input': function(e) {
 		if(e.onfocus==undefined) {
 			e.onfocus = function() {
@@ -220,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;
+		    }
+	},
+/*	'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) {
+*/    '.amount': function(e) {
 		if(e.onblur==undefined) {
   		  e.onblur = function() {
 			var dec = this.getAttribute("dec");
@@ -249,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() {
@@ -324,11 +300,11 @@ var inserts = {
 		}
 
 	},
-*/	'#msgbox': function(e) {
+*//*	'#msgbox': function(e) {
 	// this is to avoid changing div height after ajax update in IE7
 	  e.style.display = e.innerHTML.length ? 'block' : 'none';
 	}
-/* TODO
+*//* TODO
 	'a.date_picker':  function(e) {
 	    // this un-hides data picker for js enabled browsers
 	    e.href = date_picker(this.getAttribute('rel'));
@@ -355,12 +331,7 @@ function setHotKeys() {
 			_hotkeys.alt = true;
 			_hotkeys.focus = -1;
 			return stopEv(ev);
-		} else
-		if (key == 27) { // cancel selection
-			_hotkeys.alt = false;
-			_hotkeys.focus = -1;
-			return stopEv(ev);
-		} 
+		}
 		else if (_hotkeys.alt && ((key>47 && key<58) || (key>64 && key<91))) {
 			var n = _hotkeys.focus;
 			var l = document.links;
@@ -379,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<this.forms.length; j++) {
+				var form = this.forms[j];
+				for (var i=0; i<form.elements.length; i++){
+					var el = form.elements[i];
+					var asp = el.getAttribute('aspect');
+					if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
+						JsHttpRequest.request(el);
+						ev.returnValue = false;
+						return false;
+					}
+				}
+			}
+			ev.returnValue = false;
+			return false;
+		} 
 		return true;
 	};
 	document.onkeyup = function(ev) {
@@ -390,19 +382,22 @@ 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;
 	}
 }
- 
+
 Behaviour.register(inserts);
 
 Behaviour.addLoadEvent(setFocus);