|
|
@@ -1312,10 +1312,10 @@
|
|
|
//return is false or a json object => { pos: ??, c: ??} or true
|
|
|
rslt = test.fn != null ?
|
|
|
test.fn.test(chrs, getMaskSet(), position, strict, opts, isSelection(pos)) : (c === test.def || c === opts.skipOptionalPartCharacter) && test.def !== "" ? //non mask
|
|
|
- {
|
|
|
- c: getPlaceholder(position, test, true) || test.def,
|
|
|
- pos: position
|
|
|
- } : false;
|
|
|
+ {
|
|
|
+ c: getPlaceholder(position, test, true) || test.def,
|
|
|
+ pos: position
|
|
|
+ } : false;
|
|
|
|
|
|
if (rslt !== false) {
|
|
|
var elem = rslt.c !== undefined ? rslt.c : c;
|
|
|
@@ -1729,6 +1729,11 @@
|
|
|
input.inputmask._valueSet(buffer.join(""));
|
|
|
if (caretPos !== undefined && (event === undefined || event.type !== "blur")) {
|
|
|
caret(input, caretPos);
|
|
|
+ if (android && event.type === "input") {
|
|
|
+ setTimeout(function () {
|
|
|
+ caret(input, caretPos);
|
|
|
+ }, 0);
|
|
|
+ }
|
|
|
} else renderColorMask(input, buffer, caretPos);
|
|
|
if (triggerInputEvent === true) {
|
|
|
skipInputEvent = true;
|