Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion all.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 32 additions & 2 deletions dist/jquery.numberMask.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$.fn.numberMask = function (options) {
var settings = {
type: 'int', beforePoint: 10, afterPoint: 2, defaultValueInput: 0,
allowNegative: false, decimalMark: ['.'], pattern: ''
allowNegative: false, decimalMark: ['.'], pattern: '', replaceCommaPoint: false
},
regExp,
onKeyPress = function (e) {
Expand All @@ -36,7 +36,17 @@ $.fn.numberMask = function (options) {
var value = e.target.value;
var selectionParam = getSelection(e.target);
value = value.substring(0, selectionParam.start) + c + value.substring(selectionParam.end);
return (settings.allowNegative && value === '-') || regExp.test(value);
var isValid = (settings.allowNegative && value === '-') || regExp.test(value);

if (isValid && settings.replaceCommaPoint && c === ',') {
setTimeout(function () {
var selectionParamAfter = getSelection(e.target);
e.target.value = value.replace(',', '.');
setSelectionRange(e.target, selectionParamAfter.start, selectionParamAfter.end);
}, 0);
}

return isValid;
}
},
onKeyUp = function (e) {
Expand Down Expand Up @@ -93,6 +103,19 @@ $.fn.numberMask = function (options) {
statusSelection: statusSelection
};
},
setSelectionRange = function (input, selectionStart, selectionEnd) {
if (input.setSelectionRange) {
input.focus();
input.setSelectionRange(selectionStart, selectionEnd);
}
else if (input.createTextRange) {
var range = input.createTextRange();
range.collapse(true);
range.moveEnd('character', selectionEnd);
range.moveStart('character', selectionStart);
range.select();
}
},
onBlur = function (e) {
var input = $(e.target);
if (input.val() != '') {
Expand Down Expand Up @@ -125,6 +148,13 @@ $.fn.numberMask = function (options) {

$.extend(settings, options);
}

if (settings.replaceCommaPoint) {
if(settings.decimalMark.indexOf(',') !== -1){
settings.decimalMark.push(',');
}
}

if ((typeof settings.pattern == "object") && (settings.pattern instanceof RegExp)) {
regExp = settings.pattern;
} else {
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.numberMask.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading