X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=e40b9abfec5c4035dd36039ee7d29af6ef8a4236;hb=90fb6995eedba7a1f204498e1d7897b6593b95aa;hp=f568782cd342b43a7081090a900d9d6f552ccf01;hpb=d59ca2b3ff5c4772ec86ac14e5867cce3f64326e;p=kivitendo-erp.git diff --git a/js/common.js b/js/common.js index f568782cd..e40b9abfe 100644 --- 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) { - if(decpoint == thpoint) { + if(decpoint && thpoint && thpoint == decpoint) { return show_alert_and_focus(input_name, wrongNumberFormat); } var test_val = input_name.value; @@ -55,20 +55,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); - } + } } @@ -162,12 +161,14 @@ function focus_by_name(name){ } $(document).ready(function () { + // initialize all jQuery UI tab elements: + $(".tabwidget").each(function(idx, element) { $(element).tabs(); }); + $('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('fokus')) return; if (focus_by_name('cursor_fokus')) return; set_cursor_to_first_element(); });