X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=4d665e843fbe8b6a73353a745a4cbe16ec7ed96b;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=120c2ff24f03ae84007ff5f6e0e9cd659ff0116a;hpb=061f4eff6493a6cca071338156225401ae849d72;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index 120c2ff2..4d665e84 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -11,24 +11,9 @@
 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) {
-    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');
@@ -73,7 +58,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;
 		};
@@ -149,42 +134,46 @@ 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) {
-				// F4: call related database editor - not available in non-js fallback mode
-				JsHttpRequest.request('_'+this.name+'_editor', this.form);
-				return false; // prevent default binding
-				// TODO: stopPropagation when needed
-			}
 		}
 }		
 
+var _w;
+
+function callEditor(key) {
+  var el = document.getElementsByName(editors[key][1])[0]; 
+  if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/
+  _w = open(editors[key][0]+el.value+'&popup=1',
+	  "edit","Scrollbars=0,resizable=0,width=800,height=600");
+  if (_w.opener == null)
+	  _w.opener = self;
+  editors._call = key; // store call point for passBack 
+  _w.focus();
+}
+
+function passBack(value) {
+	var o = opener;
+	if(value != false) {
+		var back = o.editors[o.editors._call]; // form input bindings
+		var to = o.document.getElementsByName(back[1])[0];
+		if (to) {
+			if (to[0] != undefined)	
+				to[0].value = value; // ugly hack to set selector to any value
+			to.value = value;
+			// update page after item selection
+			o.JsHttpRequest.request('_'+to.name+'_update', to.form);
+			o.setFocus(to.name);
+		}
+	}
+	close();
+}
+
 /*
  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,15 +209,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' || old == func) { // prevent multiply binding on ajax update
+					e.onclick = func;
+				} else {
+					e.onclick = function() {
+						if(func()) 
+							{ old(); return true;}
+						else
+							return false;
+					}
+				}
+			}
+		}
 	},
     '.amount': function(e) {
 		if(e.onblur==undefined) {
@@ -249,15 +257,13 @@ 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;
-	  			}
-		  	}
-*/		},
+	},
+	'button[aspect=selector], input[aspect=selector]': function(e) {
+		e.onclick = function() {
+			passBack(this.getAttribute('rel'));
+			return false;
+		}
+	},
 	'select': function(e) {
 		if(e.onfocus==undefined) {
 			e.onfocus = function() {
@@ -268,17 +274,6 @@ var inserts = {
 			_set_combo_select(e);
 		}
 	},
-	'textarea,a': function(e) {
-		if(e.onfocus==undefined) {
-			e.onfocus = function() {
-			    save_focus(this);
-			};
-			e.onmouseover = function(e) {
-		    	setFocus(this.id, 1);
-				return false;
-			}
-		}
-	},
 	'a.printlink': 	function(l) {
 		l.onclick = function() {
 		    save_focus(this);
@@ -292,6 +287,7 @@ var inserts = {
 			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;
 			}
 		}
@@ -323,11 +319,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'));
@@ -337,9 +333,14 @@ var inserts = {
 */
 };
 function stopEv(ev) {
-			ev.returnValue = false;
-			ev.cancelBubble = true;
-			if(ev.preventDefault) ev.preventDefault();
+			if(ev.preventDefault) {
+				ev.preventDefault();
+				ev.stopPropagation();
+			} else {
+				ev.returnValue = false;
+				ev.cancelBubble = true;
+				window.keycode = 0;
+			}
 			return false;
 }
 /*
@@ -354,12 +355,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;
@@ -378,30 +374,63 @@ 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 (el.className!='editbutton' && asp=='selector' && (key==13 || key==27)) {
+						passBack(key==13 ? el.getAttribute('rel') : false);
+						ev.returnValue = false;
+						return false;
+					}
+					if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
+						JsHttpRequest.request(el);
+						ev.returnValue = false;
+						return false;
+					}
+				}
+			}
+			ev.returnValue = false;
+			return false;
+		}
+		if (editors && editors[key]) {
+			callEditor(key);
+			return stopEv(ev); // prevent default binding
+		} 
 		return true;
 	};
 	document.onkeyup = function(ev) {
-		if (_hotkeys.alt==true) {
-			ev = ev||window.event;
-			key = ev.keyCode||ev.which;
+		ev = ev||window.event;
+		key = ev.keyCode||ev.which;
 
+		if (_hotkeys.alt==true) {
 			if (key == 18) {
 				_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);