X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=js%2Finserts.js;h=ca55cfa110e8e592c102e939abbd138d6f384005;hb=08061a34b2391ac7b22b18f66b5a712274679a16;hp=4948a5cc3092d3385928d008a6ed22a6067dd2fb;hpb=51146b0a4b077137130193192afb28b7148616ab;p=fa-stable.git

diff --git a/js/inserts.js b/js/inserts.js
index 4948a5cc..ca55cfa1 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -11,9 +11,24 @@
 var _focus;
 var _hotkeys = {
 	'alt': false,	// whether is the Alt key pressed
-	'focus': -1		// currently selected indeks of document.links
+	'list': false, // list of all elements with hotkey used recently
+	'focus': -1		// currently selected list element
 };
 
+function validate(e) {
+	if (e.name && (typeof _validate[e.name] == 'function'))
+		return _validate[e.name](e);
+	else {
+		var n = e.name.indexOf('[');
+		if(n!=-1) {
+			var key = e.name.substring(n+1, e.name.length-1);
+			if (key.length>1 && _validate[e.name.substring(0,n)])
+				return _validate[e.name.substring(0,n)][key](e);
+		}
+	}
+	return true;
+}
+
 function save_focus(e) {
   _focus = e.name||e.id;
   var h = document.getElementById('hints');
@@ -26,7 +41,7 @@ function save_focus(e) {
 function _expand(tabobj) {
 
   var ul = tabobj.parentNode.parentNode;
-  var alltabs=ul.getElementsByTagName("input");
+  var alltabs=ul.getElementsByTagName("button");
   var frm = tabobj.form;
 
   if (ul.getAttribute("rel")){
@@ -53,8 +68,9 @@ function _set_combo_input(e) {
 		  save_focus(select);
 // submit request if there is submit_on_change option set and 
 // search field has changed.
+		
 		  if (button && (this.value != this.getAttribute('_last'))) {
-	  		JsHttpRequest.request(button);
+			JsHttpRequest.request(button);
 		  } else if(this.className=='combo2') {
 				this.style.display = 'none';
 				select.style.display = 'inline';
@@ -66,14 +82,21 @@ function _set_combo_input(e) {
 			var select = document.getElementsByName(this.getAttribute('rel'))[0];
 			if(select && select.selectedIndex>=0) {
 			  var len = select.length;
-			  var byid = this.className=='combo';
+			  var byid = this.className=='combo' || this.className=='combo3';
 			  var ac = this.value.toUpperCase();
 			  select.options[select.selectedIndex].selected = false;
 			  for (i = 0; i < len; i++) {
 				var txt = byid ? select.options[i].value : select.options[i].text;
-				if (txt.toUpperCase().indexOf(ac) >= 0) {
-				  select.options[i].selected = true;
-				  break;
+				if (this.className=='combo3') {
+				  if(txt.toUpperCase().indexOf(ac) == 0) {
+					select.options[i].selected = true;
+				  	break;
+				  }
+				} else {
+				  if(txt.toUpperCase().indexOf(ac) >= 0) {
+					select.options[i].selected = true;
+				  	break;
+				  }
 				}
 			  }
 			}
@@ -89,14 +112,16 @@ function _set_combo_input(e) {
 }
 
 function _update_box(s) {
-	var byid = s.className=='combo';
+	var byid = s.className=='combo' || s.className=='combo3';
 	var rel = s.getAttribute('rel');
 	var box = document.getElementsByName(rel)[0];
 		if(box && s.selectedIndex>=0) {
 			  var opt = s.options[s.selectedIndex];
 				if(box) {
+				  var old = box.value;
 				  box.value = byid ? opt.value : opt.text;
 				  box.setAttribute('_last', box.value);
+				  return old != box.value
 				}
 		}
 }
@@ -107,15 +132,18 @@ function _set_combo_select(e) {
 		// signaling we must track selectedIndex in onblur handler.
 		e.setAttribute('_last', e.selectedIndex);
 		e.onblur = function() {
-			if(this.className=='combo')
-			    _update_box(this);
-			if (this.selectedIndex != this.getAttribute('_last'))
-				this.onchange();
+		    var box = document.getElementsByName(this.getAttribute('rel'))[0];
+//			if(this.className=='combo')
+//			    _update_box(this);
+			if ((this.selectedIndex != this.getAttribute('_last'))
+				||((this.className=='combo' || this.className=='combo3') && _update_box(this))
+				)
+					this.onchange();
 		}
 		e.onchange = function() {
 			var s = this;
-			this.setAttribute('_last', this.selectedIndex);			
-			if(s.className=='combo')
+			this.setAttribute('_last', this.selectedIndex);
+			if(s.className=='combo' || this.className=='combo3')
 			    _update_box(s);
 			if(s.selectedIndex>=0) {
 				 var sname = '_'+s.name+'_update';
@@ -130,23 +158,32 @@ function _set_combo_select(e) {
 		    event = event||window.event;
 		    key = event.keyCode||event.which;
 		    var box = document.getElementsByName(this.getAttribute('rel'))[0];
-		    if (box && key == 32 && this.className == 'combo2') {
+	  		if(key == 8 || (key==37 && event.altKey)) {
+				event.returnValue = false;
+  			  	return false;
+  			}
+		    if (box && (key == 32) && (this.className == 'combo2')) {
 			    this.style.display = 'none';
 			    box.style.display = 'inline';
 				box.value='';
 				setFocus(box);
 			    return false;
+			 } else {
+			 	if (key == 13 && !e.length) // prevent chrome issue (blocked cursor after CR on empty selector)
+			 		return false;
 			 }
 		}
-}		
+}
 
 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 :/
+  var left = (screen.width - editors[key][2]) / 2;
+  var top = (screen.height - editors[key][3]) / 2;
   _w = open(editors[key][0]+el.value+'&popup=1',
-	  "edit","Scrollbars=0,resizable=0,width=800,height=600");
+	  "edit","scrollbars=yes,resizable=0,width="+editors[key][2]+",height="+editors[key][3]+",left="+left+",top="+top+",screenX="+left+",screenY="+top);
   if (_w.opener == null)
 	  _w.opener = self;
   editors._call = key; // store call point for passBack 
@@ -170,6 +207,67 @@ function passBack(value) {
 	close();
 }
 
+/*
+	Normalize date format using previous input value to guess missing date elements.
+	Helps fast date input field change with only single or double numbers (for day or day-and-month fragments)
+*/
+function fix_date(date, last)
+{
+	var dat = last.split(user.datesep);
+	var cur = date.split(user.datesep);
+	var day, month, year;
+
+// TODO: user.date as default?
+// TODO: user.datesys
+	if (date == "" || date == last) // should we return an empty date or should we return last?
+		return date;
+	if (user.datefmt == 0 || user.datefmt == 3) // set defaults
+	{
+		day = dat[1]; month = dat[0]; year = dat[2];
+	} else if (user.datefmt == 1 || user.datefmt == 4){
+		day = dat[0]; month = dat[1]; year = dat[2];
+	} else {
+		day = dat[2]; month = dat[1]; year = dat[0];
+	}
+	if (cur[1] != undefined && cur[1] != "") // day or month entered, could be string 3
+	{ 
+		if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == "")))
+			day = cur[1];
+		else	
+			month = cur[1];
+	}		
+	if (cur[0] != undefined && cur[0] != "") // day or month entered. could be string 3
+	{
+		if (cur[1] == undefined || cur[1] == "")
+			day = cur[0];
+		else if (user.datefmt == 0 || user.datefmt == 3 || ((user.datefmt == 2 || user.datefmt == 5) && (cur[2] == undefined || cur[2] == "")))
+			month = cur[0];
+		else if (user.datefmt == 2 || user.datefmt == 5)
+			year = cur[0];
+		else	
+			day = cur[0];
+	}
+	if (cur[2] != undefined && cur[2] != "") // year,
+	{
+		if (user.datefmt == 2 || user.datefmt == 5)
+			day = cur[2];
+		else
+			year = cur[2];
+	}		
+	if (user.datefmt<3) {
+		if (day<10) day = '0'+parseInt(day, 10);
+		if (month<10) month = '0'+parseInt(month, 10);
+	}	
+	if (year<100) year = year<60 ? (2000+parseInt(year,10)) : (1900+parseInt(year,10));
+
+//	console.info(day,month,year)
+	if (user.datefmt == 0 || user.datefmt==3)
+		return month+user.datesep+day+user.datesep+year;
+	if (user.datefmt == 1 || user.datefmt==4)
+		return day+user.datesep+month+user.datesep+year;
+	return year+user.datesep+month+user.datesep+day;
+}
+
 /*
  Behaviour definitions
 */
@@ -178,11 +276,11 @@ var inserts = {
 		if(e.onfocus==undefined) {
 			e.onfocus = function() {
 			    save_focus(this);
-				if (this.className == 'combo') 
+				if (this.className == 'combo' || this.className == 'combo3') 
 					this.select();
 			};
 		}
-		if (e.className == 'combo' || e.className == 'combo2') {
+		if (e.className == 'combo' || e.className == 'combo2' || e.className == 'combo3') {
 				_set_combo_input(e);
 		} 
 		else
@@ -208,35 +306,39 @@ var inserts = {
   	    // this shows divs for js enabled browsers only
 	    e.style.display = 'block';
 	},
+	'button': function(e) {
+		e.onclick = function(){
+			if (validate(e)) {
+				setTimeout(function() {	var asp = e.getAttribute('aspect');
+					set_mark((asp && (asp.indexOf('process') !== -1)) ? 'progressbar.gif' : 'ajax-loader.gif');
+				}, 100);
+				return true;
+			}
+		},
+		e.onkeydown = function(ev) {	// block unintentional page escape with 'history back' key pressed on buttons
+			ev = ev||window.event;
+ 			key = ev.keyCode||ev.which;
+	  		if(key == 8 || (key==37 && ev.altKey)) {
+				ev.returnValue = false;
+  			  	return false;
+  			}
+		}
+
+	},
 //	'.ajaxsubmit,.editbutton,.navibutton': // much slower on IE7
 	'button.ajaxsubmit,input.ajaxsubmit,input.editbutton,button.editbutton,button.navibutton': 
 	function(e) {
-		    e.onclick = function() {
-			    save_focus(e);
-					if (e.getAttribute('aspect') == 'process')
-						JsHttpRequest.request(this, null, 60000);
+			e.onclick = function() {
+				if (validate(e)) {
+					save_focus(e);
+					var asp = e.getAttribute('aspect')
+					if (asp && (asp.indexOf('process') !== -1))
+						JsHttpRequest.request(this, null, 600000); // ten minutes for backup
 					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;
-					}
 				}
+				return false;
 			}
-		}
 	},
     '.amount': function(e) {
 		if(e.onblur==undefined) {
@@ -258,26 +360,75 @@ var inserts = {
 				}
 			}
 	},
-	'button[aspect=selector], input[aspect=selector]': function(e) {
+	'.date':
+		function(e) {
+			e.setAttribute('_last_val', e.value);
+			e.setAttribute('autocomplete', 'off');
+  		  	e.onblur = function() {
+				var val = this.getAttribute('_last_val');
+				if (val != this.value) {
+					this.value = fix_date(this.value, val);
+					this.setAttribute('_last_val', this.value);
+					if (e.className.match(/\bactive\b/))
+						JsHttpRequest.request('_'+this.name+'_changed', this.form);
+				}
+			}
+	},
+	'button[aspect*selector], button[aspect*abort], input[aspect*selector]': function(e) {
 		e.onclick = function() {
 			passBack(this.getAttribute('rel'));
 			return false;
 		}
 	},
+	'button[aspect=popup]': function(e) {
+		e.onclick = function() {
+			if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/
+			 var left = (screen.width - 800)/2;
+			 var top = (screen.height - 600)/2;
+			  _w = open(document.location+'popup=1',
+				  "edit","Scrollbars=0,resizable=0,width=800,height=600, top="+top+",left="+left+",screenX="+left+",screenY="+top);
+			  if (_w.opener == null)
+				  _w.opener = self;
+			//  editors._call = key; // store call point for passBack 
+//			  _w.moveTo(50, 50);
+			  _w.focus();
+			return false;
+		}
+	},
 	'select': function(e) {
 		if(e.onfocus==undefined) {
 			e.onfocus = function() {
 			    save_focus(this);
 			};
-  		  var c = e.className;
-		  if (c == 'combo' || c == 'combo2')
+		}
+  		var c = e.className;
+		if (c == 'combo' || c == 'combo2' || c == 'combo3')
 			_set_combo_select(e);
+		else {
+			e.onkeydown = function(ev) {	// block unintentional page escape with 'history back' key pressed on buttons
+				ev = ev||window.event;
+ 				key = ev.keyCode||ev.which;
+	  			if(key == 8 || (key=37 && ev.altKey)) {
+					ev.returnValue = false;
+	  			  	return false;
+  				}
+			}
 		}
 	},
 	'a.printlink': 	function(l) {
 		l.onclick = function() {
 		    save_focus(this);
-			JsHttpRequest.request(this);
+			JsHttpRequest.request(this, null, 60000);
+			return false;
+		}
+	},
+	'a.repopts_link': 	function(l) {
+		l.onclick = function() {
+		    save_focus(this);
+		    var replinks = document.getElementsBySelector('a.repopts_link');
+				for(var i in replinks)
+					replinks[i].style.fontWeight = replinks[i]==this ? 'bold' : 'normal';
+			JsHttpRequest.request(this, null);
 			return false;
 		}
 	},
@@ -291,20 +442,41 @@ var inserts = {
 					return false;
 			}
 		}
+		// prevent unneeded transaction entry abortion
+		if (e.className == 'shortcut' 
+		 || e.className == 'menu_option' 
+		 || e.className == 'menu_tab'
+ 		 || e.className == 'selected')
+			e.onclick = function(ev) {
+				if (_validate._processing 
+				 && _validate._modified
+				 && !confirm(_validate._processing)) {
+					ev.returnValue = false;
+					return false;
+				}
+				window.location = e.href;
+			}
 	},
 	'ul.ajaxtabs':	function(ul) {
 	    var ulist=ul.getElementsByTagName("li");
 	    for (var x=0; x<ulist.length; x++){ //loop through each LI e
-		var ulistlink=ulist[x].getElementsByTagName("input")[0];
-		if(ulistlink.onclick==undefined) {
+		var tab=ulist[x].getElementsByTagName("button")[0];
+//		if(tab.onclick==undefined) {
 // ?  var modifiedurl=ulistlink.getAttribute("href").replace(/^http:\/\/[^\/]+\//i, "http://"+window.location.hostname+"/")
-		    var url = ulistlink.form.action
-		    ulistlink.onclick=function(){
+		    var url = tab.form.action
+		    tab.onclick=function(){
 			_expand(this);
 			return false;
 		    }
 		}
-	    }
+//	    }
+	},
+	'textarea': function(e) {
+		if(e.onfocus==undefined) {
+			e.onfocus = function() {
+			    save_focus(this);
+			};
+		}
 	}
 /*	'tr.editrow': function(e) {
 		  	e.onkeydown = function(ev) { 
@@ -358,24 +530,25 @@ function setHotKeys() {
 			return stopEv(ev);
 		}
 		else if (ev.altKey && !ev.ctrlKey && ((key>47 && key<58) || (key>64 && key<91))) {
+			key = String.fromCharCode(key);
 			var n = _hotkeys.focus;
-			var l = document.links;
+			var l = document.getElementsBySelector('[accesskey='+key+']');
 			var cnt = l.length;
-			key = String.fromCharCode(key);
+			_hotkeys.list = l;
 			for (var i=0; i<cnt; i++) { 
 				n = (n+1)%cnt;
 				// check also if the link is visible
 				if (l[n].accessKey==key && l[n].scrollWidth) {
 					_hotkeys.focus = n;
 	    // The timeout is needed to prevent unpredictable behaviour on IE.
-					var tmp = function() {document.links[_hotkeys.focus].focus();};
+					var tmp = function() {l[_hotkeys.focus].focus();};
 					setTimeout(tmp, 0);
 					break;
 				}
 			}
 			return stopEv(ev);
 		}
-		if((ev.ctrlKey && key == 13) || (key == 27 && ev.altKey)) {
+		if((ev.ctrlKey && key == 13) || key == 27) {
 			_hotkeys.alt = false; // cancel link selection
 			_hotkeys.focus = -1;
 			ev.cancelBubble = true;
@@ -386,13 +559,22 @@ 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)) {
+
+					if (el.className!='editbutton' && (asp && asp.indexOf('selector') !== -1) && (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);
+					if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) {
+						if (validate(el)) {
+							if (asp.indexOf('nonajax') !== -1)
+								el.click();
+							else
+							if (asp.indexOf('process') !== -1)
+								JsHttpRequest.request(el, null, 600000);
+							else
+								JsHttpRequest.request(el);
+						}
 						ev.returnValue = false;
 						return false;
 					}
@@ -401,7 +583,7 @@ function setHotKeys() {
 			ev.returnValue = false;
 			return false;
 		}
-		if (editors && editors[key]) {
+		if (editors!=='undefined' && editors[key]) {
 			callEditor(key);
 			return stopEv(ev); // prevent default binding
 		} 
@@ -414,8 +596,8 @@ function setHotKeys() {
 		if (_hotkeys.alt==true) {
 			if (key == 18) {
 				_hotkeys.alt = false;
-				if (_hotkeys.focus>=0) {
-					var link = document.links[_hotkeys.focus];
+				if (_hotkeys.focus >= 0) {
+					var link = _hotkeys.list[_hotkeys.focus];
 					if(link.onclick) 
 						link.onclick();
 					else