fix js number test

[mfinanz.git] / js / common.js

diff --git a/js/common.js b/js/common.js
index f568782cd342b43a7081090a900d9d6f552ccf01..279ff8dae9213555994a496f89fce2815c9075f8 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -45,7 +45,7 @@ function set_longdescription_window(input_name) {
   }
 
 function check_right_number_format(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);
   }
   var test_val = input_name.value;
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
   var test_val = input_name.value;


@@ -55,10 +55,9 @@ function check_right_number_format(input_name) {
   if(thpoint && thpoint == '.'){
     test_val = test_val.replace(/\./g, '');
   }
   if(thpoint && thpoint == '.'){
     test_val = test_val.replace(/\./g, '');
   }

-  if(thpoint && decpoint == ','){
+  if(decpoint && decpoint == ','){

     test_val = test_val.replace(/,/g, '.');
   }
     test_val = test_val.replace(/,/g, '.');
   }

-

   var forbidden = test_val.match(/[^-\+\/\*\.0-9\ ]/g );
   if (forbidden && forbidden.length > 0 ){
     return show_alert_and_focus(input_name, wrongNumberFormat);
   var forbidden = test_val.match(/[^-\+\/\*\.0-9\ ]/g );
   if (forbidden && forbidden.length > 0 ){
     return show_alert_and_focus(input_name, wrongNumberFormat);