X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=cabc6507ed0a49beccb02f6a92692a76f2c62473;hb=7e96b2d0682294a98eef838fbad910bbaaa1f08d;hp=6d818f312fed73aac0009e9826333e939bb2121e;hpb=6b063f3c88f7ca16e83a19759441a05e0ff84a47;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 6d818f312..cabc6507e 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,17 +1,12 @@
-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) {
@@ -42,6 +37,7 @@ 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=" + encodeURIComponent(document.getElementsByName(input_name)[0].value) + "&" +
     "input_name=" + encodeURIComponent(input_name) + "&"
@@ -49,30 +45,30 @@ function set_longdescription_window(input_name) {
   }
 
 function check_right_number_format(input_name) {
-  if(decpoint == thpoint) {
+  if(decpoint && thpoint && thpoint == decpoint) {
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
-  if(decpoint == ',') {
-    var decnumbers = input_name.value.split(',');
-  }
-  else {
-    var decnumbers = input_name.value.split('.');
+  var test_val = input_name.value;
+  if(thpoint && thpoint == ','){
+    test_val = test_val.replace(/,/g, '');
   }
-  if(decnumbers.length == 2) {
-    if(decnumbers[1].length > 2)  {
-      return show_alert_and_focus(input_name, wrongNumberFormat);
-    }
+  if(thpoint && thpoint == '.'){
+    test_val = test_val.replace(/\./g, '');
   }
-  else {
-    if(decnumbers.length > 2) {
-      return show_alert_and_focus(input_name, wrongNumberFormat);
-    }
-    if(!thpoint) {
-      if(decnumbers[0].match(/\D/)) {
-        return show_alert_and_focus(input_name, wrongNumberFormat);
-      }
-    }
+  if(decpoint && decpoint == ','){
+    test_val = test_val.replace(/,/g, '.');
   }
+  var forbidden = test_val.match(/[^\s\d\(\)\-\+\*\/\.]/g);
+  if (forbidden && forbidden.length > 0 ){
+    return show_alert_and_focus(input_name, wrongNumberFormat);
+  } 
+
+  try{ 
+    eval(test_val);
+  }catch(err){
+    return show_alert_and_focus(input_name, wrongNumberFormat);
+  } 
+
 }
 
 function check_right_date_format(input_name) {
@@ -87,7 +83,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);
     }
   }
@@ -126,7 +122,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])
@@ -134,26 +130,10 @@ function get_input_value(input_name) {
   return '';
 }
 
-a_onfocus_functions["focus_listener"] = (function (event) { 
-  if (focussable(event.target)) window.focused_element = event.target;
-});
-
-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();
+  $('[name=' + n + ']').focus();
 }
 
-a_onload_functions["restore_cursor_position"] = (function () {
-  var e = document.getElementsByName('cursor_fokus')[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.name && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
 }
@@ -166,16 +146,31 @@ function set_cursor_to_first_element(){
         try { df[f][i].focus(); return } catch (er) { }
 }
 
-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() {
-  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);
+function getElementByIndirectName(name){
+  var e = document.getElementsByName(name)[0];
+  if (e) return document.getElementsByName(e.value)[0];
 }
-do_load_events();
+
+function focus_by_name(name){
+  var f = getElementByIndirectName(name);
+  if (focussable(f)) {
+    set_cursor_position(f.name);
+    return true;
+  }
+  return false;
+}
+
+$(document).ready(function () {
+  $('input').focus(function(){
+    if (focussable(this)) window.focused_element = this;
+  });
+  // legacy. sone forms install these
+  if (typeof fokus == 'function') { fokus(); return; }
+  if (focus_by_name('cursor_fokus')) return;
+  set_cursor_to_first_element();
+});
+
+$('form').submit(function(){
+  if (window.focused_element)
+    document.forms[0].cursor_fokus.value = window.focused_element.name;
+});