projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JS-Menü-Einträge schmaler rendern
[kivitendo-erp.git]
/
js
/
common.js
diff --git
a/js/common.js
b/js/common.js
index
f568782
..
cabc650
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
== th
point) {
+ if(decpoint
&& thpoint && thpoint == dec
point) {
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,11
+55,10
@@
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(
th
point && decpoint == ','){
+ if(
dec
point && decpoint == ','){
test_val = test_val.replace(/,/g, '.');
}
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);
}
if (forbidden && forbidden.length > 0 ){
return show_alert_and_focus(input_name, wrongNumberFormat);
}
@@
-167,7
+166,6
@@
$(document).ready(function () {
});
// legacy. sone forms install these
if (typeof fokus == 'function') { fokus(); return; }
});
// 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();
});
if (focus_by_name('cursor_fokus')) return;
set_cursor_to_first_element();
});