X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=916011503adb49b45b25f0bc7d783904dc3cb2f2;hb=2daee349a1c5d14ba76f6b9c7716258ac2f42929;hp=953dac7fba524eb92124e789849bc27956c56e61;hpb=12a7cea9c3434848878d1a7b023dd47482cbb9b4;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 953dac7fb..916011503 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,13 +1,12 @@
-
 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) {
@@ -34,65 +33,31 @@ 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) + "&"
-  window.open(url, "_new_generic", parm);
-  }
-
 function check_right_number_format(input_name) {
-//   if(thpoint) {
-//     if(thpoint == ','){
-//       var thnumbers = input_name.value.split(',');  
-//       thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring((thnumbers[thnumbers.length-1].lastIndexOf(".") !== -1 ? thnumbers[thnumbers.length-1].lastIndexOf(".") : thnumbers[thnumbers.length-1].length), 0);
-//     }
-//     else{
-//       var thnumbers = input_name.value.split('.');  
-//       thnumbers[thnumbers.length-1] = thnumbers[thnumbers.length-1].substring((thnumbers[thnumbers.length-1].lastIndexOf(",") !== -1 ? thnumbers[thnumbers.length-1].lastIndexOf(",") : thnumbers[thnumbers.length-1].length), 0);
-//     }
-//         
-//     for(var i = 0; i < thnumbers.length; i++) {
-//      if(i == 0 && thnumbers[i].length > 3) {
-//       return show_alert_and_focus(input_name, wrongNumberFormat);
-//      }
-//      if(i > 0 && thnumbers[i].length != 3) {
-//        return show_alert_and_focus(input_name, wrongNumberFormat);
-//      }
-//    }
-//   }
-  if(decpoint == thpoint) {
+  if(decpoint && thpoint && thpoint == decpoint) {
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
-  if(decpoint == ',') {
-    var decnumbers = input_name.value.split(',');
+  var test_val = input_name.value;
+  if(thpoint && thpoint == ','){
+    test_val = test_val.replace(/,/g, '');
   }
-  else {
-    var decnumbers = input_name.value.split('.');
+  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(decpoint && decpoint == ','){
+    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);
-      }
-    }
+  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) {
@@ -107,7 +72,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);
     }
   }
@@ -146,10 +111,60 @@ 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])
     return the_input[0].value;
   return '';
 }
+
+function set_cursor_position(n) {
+  $('[name=' + n + ']').focus();
+}
+
+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 (focussable(df[f][i]))
+        try { df[f][i].focus(); return } catch (er) { }
+}
+
+function getElementByIndirectName(name){
+  var e = document.getElementsByName(name)[0];
+  if (e) return document.getElementsByName(e.value)[0];
+}
+
+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;
+  });
+
+  var initial_focus = $(".initial_focus").filter(':visible')[0];
+  if (initial_focus)
+    $(initial_focus).focus();
+
+  // 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;
+});