X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=js%2Finserts.js;h=dd78a9f607be68de748e56c8bfde841f26093e8a;hb=89cb648e9d031fa624e7814f89e90ccba2042124;hp=01fad9985f28912f80f2d77cf151c309c1f3583f;hpb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index 01fad998..dd78a9f6 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -1,24 +1,25 @@
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 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
 };
+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');
@@ -63,7 +64,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;
 		};
@@ -139,7 +140,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) {
@@ -155,20 +156,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() {
@@ -203,14 +190,35 @@ var inserts = {
   	    // this shows divs for js enabled browsers only
 	    e.style.display = 'block';
 	},
-	'input.ajaxsubmit','button.ajaxsubmit,button.editbutton,button.navibutton': 
+//	'.ajaxsubmit,.editbutton,.navibutton': // much slower on IE7
+	'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.editbutton,button.navibutton': 
 	function(e) {
-	    e.onclick = function() {
-			if (this.getAttribute('aspect') == 'process')
-				progbar();
-			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) {
@@ -231,15 +239,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() {
@@ -255,6 +255,28 @@ var inserts = {
 			e.onfocus = function() {
 			    save_focus(this);
 			};
+			e.onmouseover = function(e) {
+		    	setFocus(this);
+				return false;
+			}
+		}
+	},
+	'a.printlink': 	function(l) {
+		l.onclick = function() {
+		    save_focus(this);
+			JsHttpRequest.request(this);
+			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) {
@@ -271,7 +293,20 @@ var inserts = {
 		}
 	    }
 	},
-	'#msgbox': function(e) {
+/*	'tr.editrow': function(e) {
+		  	e.onkeydown = function(ev) { 
+	  		ev = ev||window.event;
+	  		key = ev.keyCode||ev.which;
+	  		if(key == 13) {
+			  // Find & click additem/update button
+			  
+	  		} else	if(key == 27) {
+	  		  return false;
+			}
+		}
+
+	},
+*/	'#msgbox': function(e) {
 	// this is to avoid changing div height after ajax update in IE7
 	  e.style.display = e.innerHTML.length ? 'block' : 'none';
 	}
@@ -298,16 +333,11 @@ function setHotKeys() {
 	document.onkeydown = function(ev) {
 		ev = ev||window.event;
 		key = ev.keyCode||ev.which;
-		if (key == 18) {	// start selection
+		if (key == 18 && !ev.ctrlKey) {	// start selection, skip Win AltGr
 			_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;
@@ -326,6 +356,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) {
@@ -336,10 +387,18 @@ function setHotKeys() {
 			if (key == 18) {
 				_hotkeys.alt = false;
 				if (_hotkeys.focus>=0) {
-					window.location = document.links[_hotkeys.focus].href;
+					var link = document.links[_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;
 	}