X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=745aa2c7631b0df66ad55320e18c6e47011a1ba4;hb=e478bcee10a2018456fd202d670461159090119c;hp=1026fbf623276bfec5a80ef8cb6d0e0235890a38;hpb=4415553f170c38216804b08de6ce383f1e61d6b8;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index 1026fbf6..745aa2c7 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');
@@ -152,15 +137,36 @@ function _set_combo_select(e) {
 				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
-			}
 		}
 }		
 
+function callEditor(key) {
+  var el = document.getElementsByName(editors[key][1])[0]; 
+  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
 */
@@ -200,17 +206,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;
+		    }
 	},
-    '.amount': function(e) {
+/*	'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) {
   		  e.onblur = function() {
 			var dec = this.getAttribute("dec");
@@ -229,7 +254,13 @@ var inserts = {
 					JsHttpRequest.request('_'+this.name+'_changed', this.form);
 				}
 			}
-		},
+	},
+	'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() {
@@ -296,11 +327,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'));
@@ -310,9 +341,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;
 }
 /*
@@ -357,6 +393,11 @@ function setHotKeys() {
 				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;
@@ -366,26 +407,33 @@ function setHotKeys() {
 			}
 			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;
 	}