|
|
@@ -2,7 +2,7 @@ import $ from "./dependencyLibs/inputmask.dependencyLib";
|
|
|
import MaskToken from "./masktoken";
|
|
|
import Inputmask from "./inputmask";
|
|
|
|
|
|
-export {generateMaskSet, analyseMask};
|
|
|
+export { generateMaskSet, analyseMask };
|
|
|
|
|
|
function generateMaskSet(opts, nocache) {
|
|
|
var ms;
|
|
|
@@ -115,7 +115,7 @@ function analyseMask(mask, regexMask, opts) {
|
|
|
position = position !== undefined ? position : mtoken.matches.length;
|
|
|
var prevMatch = mtoken.matches[position - 1];
|
|
|
if (regexMask) {
|
|
|
- if (element.indexOf("[") === 0 || (escaped && /\\d|\\s|\\w]/i.test(element)) || element === ".") {
|
|
|
+ if (element.indexOf("[") === 0 || (escaped && /\\d|\\s|\\w/i.test(element)) || element === ".") {
|
|
|
mtoken.matches.splice(position++, 0, {
|
|
|
fn: new RegExp(element, opts.casing ? "i" : ""),
|
|
|
static: false,
|
|
|
@@ -323,6 +323,18 @@ function analyseMask(mask, regexMask, opts) {
|
|
|
case "\\d":
|
|
|
m = "[0-9]";
|
|
|
break;
|
|
|
+ case "(?=": //lookahead
|
|
|
+ // openenings.push(new MaskToken(true));
|
|
|
+ break;
|
|
|
+ case "(?!": //negative lookahead
|
|
|
+ // openenings.push(new MaskToken(true));
|
|
|
+ break;
|
|
|
+ case "(?<=": //lookbehind
|
|
|
+ // openenings.push(new MaskToken(true));
|
|
|
+ break;
|
|
|
+ case "(?<!": //negative lookbehind
|
|
|
+ // openenings.push(new MaskToken(true));
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -330,20 +342,6 @@ function analyseMask(mask, regexMask, opts) {
|
|
|
defaultCase();
|
|
|
continue;
|
|
|
}
|
|
|
- switch (m) {
|
|
|
- case "(?=": //lookahead
|
|
|
- // openenings.push(new MaskToken(true));
|
|
|
- break;
|
|
|
- case "(?!": //negative lookahead
|
|
|
- // openenings.push(new MaskToken(true));
|
|
|
- break;
|
|
|
- case "(?<=": //lookbehind
|
|
|
- // openenings.push(new MaskToken(true));
|
|
|
- break;
|
|
|
- case "(?<!": //negative lookbehind
|
|
|
- // openenings.push(new MaskToken(true));
|
|
|
- break;
|
|
|
- }
|
|
|
switch (m.charAt(0)) {
|
|
|
case "$":
|
|
|
case "^":
|
|
|
@@ -354,9 +352,7 @@ function analyseMask(mask, regexMask, opts) {
|
|
|
break;
|
|
|
case opts.escapeChar:
|
|
|
escaped = true;
|
|
|
- if (regexMask) {
|
|
|
- defaultCase();
|
|
|
- }
|
|
|
+ if (regexMask) defaultCase();
|
|
|
break;
|
|
|
// optional closing
|
|
|
case opts.optionalmarker[1]:
|