X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=1911bef777a8d05db194e5e7ea07c30e834feb54;hb=61ab3c630bf655d54cb44f70f871eed5879f9693;hp=69915eec4d07e117790dfc8e4badfdf7819fa164;hpb=f5e340dfd90576faa5130ca4530840e6d2ce5e81;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 69915eec4..1911bef77 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,17 +1,17 @@
-
-if (!window.a_onload_functions)   var a_onload_functions   = new Object();
-if (!window.a_onsubmit_functions) var a_onsubmit_functions = new Object();
-
+if (!window.a_onload_functions)   a_onload_functions   = new Object();
+if (!window.a_onsubmit_functions) a_onsubmit_functions = new Object();
+if (!window.a_onfocus_functions)  a_onfocus_functions  = new Object();
+window.focused_element = null;
 
 function setupPoints(numberformat, wrongFormat) {
   decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,/) ? 6 : 5));
   if (numberformat.substring(1, 2).match(/\.|\,/)) {
-    thpoint = numberformat.substring(1, 2); 
+    thpoint = numberformat.substring(1, 2);
   }
   else {
     thpoint = null;
   }
-  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";  
+  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";
 }
 
 function setupDateFormat(setDateFormat, setWrongDateFormat) {
@@ -38,18 +38,14 @@ function centerParms(width,height,extra) {
   return string;
 }
 
-function escape_more(s) {
-  s = escape(s);
-  return s.replace(/\+/g, '%2b');
-}
-
 function set_longdescription_window(input_name) {
   var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";
   var name = document.getElementsByName(input_name)[0].value;
   url = "common.pl?" +
+    "INPUT_ENCODING=UTF-8&" +
     "action=set_longdescription&" +
-    "longdescription=" + escape_more(document.getElementsByName(input_name)[0].value) + "&" +
-    "input_name=" + escape_more(input_name) + "&"
+    "longdescription=" + encodeURIComponent(document.getElementsByName(input_name)[0].value) + "&" +
+    "input_name=" + encodeURIComponent(input_name) + "&"
   window.open(url, "_new_generic", parm);
   }
 
@@ -65,7 +61,7 @@ function check_right_number_format(input_name) {
   }
   if(decnumbers.length == 2) {
     if(decnumbers[1].length > 2)  {
-      return show_alert_and_focus(input_name, wrongNumberFormat);
+     /* return show_alert_and_focus(input_name, wrongNumberFormat); */
     }
   }
   else {
@@ -92,7 +88,7 @@ function check_right_date_format(input_name) {
     }
   }
   else {
-    if (dateFormat.lastIndexOf("y") == 3 && !matching.test(input_name.value)) { 
+    if (dateFormat.lastIndexOf("y") == 3 && !matching.test(input_name.value)) {
       return show_alert_and_focus(input_name, wrongDateFormat);
     }
   }
@@ -131,7 +127,7 @@ function show_alert_and_focus(input_name, errorMessage) {
   input_name.focus();
   return false;
 }
-  
+
 function get_input_value(input_name) {
   var the_input = document.getElementsByName(input_name);
   if (the_input && the_input[0])
@@ -139,54 +135,48 @@ function get_input_value(input_name) {
   return '';
 }
 
-window.focused_element = null;
-document.addEventListener("focus", function(event){ 
-  var e = event.target;
-  if (is_element_focussable(e)) window.focused_element = e;
-}, true);
+a_onfocus_functions["focus_listener"] = (function (event) {
+  if (focussable(event.target)) window.focused_element = event.target;
+});
 
-function get_cursor_position() {
+a_onsubmit_functions["get_cursor_position"] = (function () {
   if (window.focused_element)
-  document.forms[0].cursor_fokus.value = window.focused_element.name;
-}
+    document.forms[0].cursor_fokus.value = window.focused_element.name;
+});
 
 function set_cursor_position(n) {
   document.getElementsByName(n)[0].focus();
 }
 
-function restore_cursor_position() {
+a_onload_functions["restore_cursor_position"] = (function () {
   var e = document.getElementsByName('cursor_fokus')[0];
-  var f = document.getElementsByName(e.value)[0];
-  if (is_element_focussable(f)) set_cursor_position(f.name)
-   else set_cursor_to_first_element();
-}
+  if (e) var f = document.getElementsByName(e.value)[0];
+  if (focussable(f)) set_cursor_position(f.name)
+    else set_cursor_to_first_element();
+});
 
-function is_element_focussable(e) {
-  return e && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
+function focussable(e) {
+  return e && e.name && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
 }
 
 function set_cursor_to_first_element(){
   var df = document.forms;
   for (var f = 0; f < df.length; f++)
     for (var i = 0; i < df[f].length; i++)
-      if (is_element_focussable(df[f][i]))
+      if (focussable(df[f][i]))
         try { df[f][i].focus(); return } catch (er) { }
 }
-a_onload_functions["restore_cursor_position"] = restore_cursor_position;
-a_onsubmit_functions["get_cursor_position"]   = get_cursor_position;
+
+function add_event(e, type, fn, c) {
+  var ret = 0;
+  if (e.addEventListener) e.addEventListener(type, fn, c)
+  else if (e.attachEvent) e.attachEvent('on' + type, fn)
+  else e['on' + type] = fn;
+}
 
 function do_load_events() {
-  var oldl = window.onload;
-  window.onload = function() {
-    if (oldl) oldl();
-    if (window.a_onload_functions) 
-      for (var name in window.a_onload_functions) 
-        a_onload_functions[name]();
-  }
-  window.onsubmit = function() {
-    if (window.a_onsubmit_functions) 
-      for (var name in window.a_onsubmit_functions) 
-        a_onsubmit_functions[name]();
-  }
+  for (var name in window.a_onload_functions)   add_event(window, "load",   window.a_onload_functions[name],   false);
+  for (var name in window.a_onsubmit_functions) add_event(window, "submit", window.a_onsubmit_functions[name], false);
+  for (var name in window.a_onfocus_functions)  add_event(window, "focus",  window.a_onfocus_functions[name],  false);
 }
 do_load_events();