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

diff --git a/js/inserts.js b/js/inserts.js
index f05a8772..156882bf 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -1,7 +1,17 @@
+/**********************************************************************
+    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
 };
 
 function debug(msg) {
@@ -63,7 +73,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 +149,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) {
@@ -162,7 +172,13 @@ var inserts = {
 			if((ev.ctrlKey && key == 13) || key == 27) {
 				ev.cancelBubble = true;
     			if(ev.stopPropagation) ev.stopPropagation();
-// here ctrl-enter/escape support
+				// 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;
 			} 
@@ -204,11 +220,12 @@ var inserts = {
 	    e.style.display = 'block';
 	},
 //	'.ajaxsubmit,.editbutton,.navibutton': // much slower on IE7
-	'button.ajaxsubmit,submit.ajaxsubmit,submit.editbutton,submit.navibutton': 
+	'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.navibutton': 
 	function(e) {
 	    e.onclick = function() {
 			if (this.getAttribute('aspect') == 'process')
 				progbar();
+		    save_focus(this);
 			JsHttpRequest.request(this);
 			return false;
 	    }
@@ -256,6 +273,10 @@ var inserts = {
 			e.onfocus = function() {
 			    save_focus(this);
 			};
+			e.onmouseover = function(e) {
+		    	setFocus(this);
+				return false;
+			}
 		}
 	},
 	'a.printlink': 	function(l) {
@@ -265,6 +286,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; x<ulist.length; x++){ //loop through each LI e
@@ -279,7 +311,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';
 	}
@@ -306,7 +351,7 @@ 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);
@@ -357,7 +402,7 @@ function setHotKeys() {
 		return true;
 	}
 }
-
+ 
 Behaviour.register(inserts);
 
 Behaviour.addLoadEvent(setFocus);