Das Javascript-Menü durch eine andere Implementation ersetzt, die auch unter dem...

[kivitendo-erp.git] / js / common.js

diff --git a/js/common.js b/js/common.js
index 841e9f7..6d818f3 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -1,6 +1,6 @@
-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_onfocus_functions)  var a_onfocus_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) {
@@ -38,18 +38,13 @@ 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?" +
     "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);
   }
 
@@ -139,28 +134,28 @@ function get_input_value(input_name) {
   return '';
 }
 
-a_onfocus_functions["focus_listener"] = function (event) { 
+a_onfocus_functions["focus_listener"] = (function (event) { 
   if (focussable(event.target)) window.focused_element = event.target;
-}
+});
 
-a_onsubmit_functions["get_cursor_position"] = function () {
+a_onsubmit_functions["get_cursor_position"] = (function () {
   if (window.focused_element)
     document.forms[0].cursor_fokus.value = window.focused_element.name;
-}
+});
 
 function set_cursor_position(n) {
   document.getElementsByName(n)[0].focus();
 }
 
-a_onload_functions["restore_cursor_position"] = function () {
+a_onload_functions["restore_cursor_position"] = (function () {
   var e = document.getElementsByName('cursor_fokus')[0];
-  var f = document.getElementsByName(e.value)[0];
+  if (e) var f = document.getElementsByName(e.value)[0];
   if (focussable(f)) set_cursor_position(f.name)
     else set_cursor_to_first_element();
-}
+});
 
 function focussable(e) {
-  return e && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
+  return e && e.name && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
 }
 
 function set_cursor_to_first_element(){
@@ -173,15 +168,14 @@ function set_cursor_to_first_element(){
 
 function add_event(e, type, fn, c) {
   var ret = 0;
-  if (e.addEventListener) ret = e.addEventListener(type, fn, c)
-  else if (e.attachEvent) ret = e.attachEvent('on' + type, fn)
+  if (e.addEventListener) e.addEventListener(type, fn, c)
+  else if (e.attachEvent) e.attachEvent('on' + type, fn)
   else e['on' + type] = fn;
-  return ret;
 } 
 
 function do_load_events() {
   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],  true);
+  for (var name in window.a_onfocus_functions)  add_event(window, "focus",  window.a_onfocus_functions[name],  false);
 }
 do_load_events();