X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=js%2Fcommon.js;h=d2594a2778b551007302afe7f81fdee617cb43b9;hb=5c4833d72ee69bdbbc4aefe469caf2913801c96a;hp=f568782cd342b43a7081090a900d9d6f552ccf01;hpb=d59ca2b3ff5c4772ec86ac14e5867cce3f64326e;p=kivitendo-erp.git diff --git a/js/common.js b/js/common.js index f568782cd..d2594a277 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); - } + } } @@ -161,13 +160,39 @@ function focus_by_name(name){ return false; } +function open_jqm_window(params) { + params = params || { }; + var url = params.url; + var id = params.id ? params.id : 'jqm_popup_dialog'; + + if (params.data) { + var data = typeof params.data === "string" ? params.data : $.param(params.data); + url += (/\?/.exec(url) ? "&" : "?") + data; + } + + $('#' + id).remove(); + var div = $('
').hide().appendTo('body'); + var close = $('').appendTo(div); + var content = $('').appendTo(div); + div.jqm({ modal: true }); + div.jqmShow(); + $.ajax({ url: url, success: function(new_html) { $(content).html(new_html); } }); + $(close).click(function() { + div.jqmClose(); + }); + + return true; +} + $(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(); });