Merge pull request #542 from kapcake/patch-1
Update money regex to allow more than 6 figures on integer part
This commit is contained in:
@@ -178,8 +178,8 @@ function uploadFileAsync(event) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
function isValidMoney(input) {
|
function isValidMoney(input) {
|
||||||
const euRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}(\.?\d{3})?(,\d{1,3}?)?\)?$/;
|
const euRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}((\.\d{3}){0,8}|(\d{3}){0,8})(,\d{1,3}?)?\)?$/;
|
||||||
const usRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}(,?\d{3})?(\.\d{1,3}?)?\)?$/;
|
const usRegex = /^\$?(?=\(.*\)|[^()]*$)\(?\d{1,3}((,\d{3}){0,8}|(\d{3}){0,8})(\.\d{1,3}?)?\)?$/;
|
||||||
return (euRegex.test(input) || usRegex.test(input));
|
return (euRegex.test(input) || usRegex.test(input));
|
||||||
}
|
}
|
||||||
function initDatePicker(input, futureOnly) {
|
function initDatePicker(input, futureOnly) {
|
||||||
@@ -1053,4 +1053,4 @@ function bindModalInputChanges(modalName) {
|
|||||||
$(`#${modalName} select, #${modalName} input[type='checkbox']`).off('input').on('input', function (e) {
|
$(`#${modalName} select, #${modalName} input[type='checkbox']`).off('input').on('input', function (e) {
|
||||||
$(e.currentTarget).attr('data-changed', true);
|
$(e.currentTarget).attr('data-changed', true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user