X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=916011503adb49b45b25f0bc7d783904dc3cb2f2;hb=5cdcf572cfe983e66b14aefde3533614edefbb7e;hp=f568782cd342b43a7081090a900d9d6f552ccf01;hpb=d59ca2b3ff5c4772ec86ac14e5867cce3f64326e;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index f568782cd..916011503 100644
--- a/js/common.js
+++ b/js/common.js
@@ -33,19 +33,8 @@ function centerParms(width,height,extra) {
   return string;
 }
 
-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) + "&"
-  window.open(url, "_new_generic", parm);
-  }
-
 function check_right_number_format(input_name) {
-  if(decpoint == thpoint) {
+  if(decpoint && thpoint && thpoint == decpoint) {
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
   var test_val = input_name.value;
@@ -55,20 +44,19 @@ function check_right_number_format(input_name) {
   if(thpoint && thpoint == '.'){
     test_val = test_val.replace(/\./g, '');
   }
-  if(thpoint && decpoint == ','){
+  if(decpoint && decpoint == ','){
     test_val = test_val.replace(/,/g, '.');
   }
-
-  var forbidden = test_val.match(/[^-\+\/\*\.0-9\ ]/g );
+  var forbidden = test_val.match(/[^\s\d\(\)\-\+\*\/\.]/g);
   if (forbidden && forbidden.length > 0 ){
     return show_alert_and_focus(input_name, wrongNumberFormat);
-  } 
+  }
 
-  try{ 
+  try{
     eval(test_val);
   }catch(err){
     return show_alert_and_focus(input_name, wrongNumberFormat);
-  } 
+  }
 
 }
 
@@ -165,9 +153,13 @@ $(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('fokus'))        return;
   if (focus_by_name('cursor_fokus')) return;
   set_cursor_to_first_element();
 });