X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=b354d3cccb80ec5d7f0fe4529370cde6943961f8;hb=a30e24857507c901339abb25dc3510c881cbdbe2;hp=d4d5ab7b9a266be6703beefc89ae974d898d6df5;hpb=f411025cef83276e66b13a30420876cfbd457fc6;p=kivitendo-erp.git diff --git a/js/common.js b/js/common.js index d4d5ab7b9..b354d3ccc 100644 --- a/js/common.js +++ b/js/common.js @@ -34,6 +34,11 @@ 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; @@ -41,30 +46,33 @@ function set_longdescription_window(input_name) { "action=set_longdescription&" + "login=" + encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+ "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" + - "longdescription=" + escape(document.getElementsByName(input_name)[0].value) + "&" + - "input_name=" + escape(input_name) + "&" + "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(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) { + return show_alert_and_focus(input_name, wrongNumberFormat); } if(decpoint == ',') { var decnumbers = input_name.value.split(',');