problem with two separate alternaions #1722

CHANGELOG.md

@@ -6,12 +6,14 @@ All notable changes to this project will be documented in this file.
 - new datetime alias (WIP)
 
 ### Updates
+- fix in determineTestTemplate.  Impacts alternations.
 - rename androidHack option to disablePredictiveText. Make it available for other platforms.
 - drop Regex alias
 - drop all date/time related aliases
 - enhance inputfallback (Android)
 
 ### Fixed
+- problem with two separate alternaions #1722
 - colorMask + Remask = Duplicate im-colormask element #1709
 
 ## [3.3.9 - 2017-10-10]

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "4.0.0-52",
+  "version": "4.0.0-53",
   "main": [
 	  "./dist/inputmask/inputmask.js",
 	  "./dist/inputmask/inputmask.extensions.js",

component.json

@@ -2,7 +2,7 @@
 	"name": "inputmask",
 	"repository": "robinherbots/Inputmask",
 	"description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-	"version": "4.0.0-52",
+	"version": "4.0.0-53",
 	"keywords": [
 		"jquery",
 		"plugins",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/inputmask",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-  "version": "4.0.0-52",
+  "version": "4.0.0-53",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",

dist/inputmask/bindings/inputmask.binding.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/global/document.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/global/window.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {
@@ -96,7 +96,7 @@
                 opts.outputFormat = formatAlias[opts.outputFormat] || opts.outputFormat || opts.inputFormat, 
                 opts.placeholder = opts.placeholder !== Inputmask.prototype.defaults.placeholder ? opts.placeholder : opts.inputFormat, 
                 opts.min = analyseMask(opts.min, opts.inputFormat, opts), opts.max = analyseMask(opts.max, opts.inputFormat, opts), 
-                opts.regex = parse(opts.inputFormat, opts), console.log(opts.regex), null;
+                opts.regex = parse(opts.inputFormat, opts), null;
             },
             inputFormat: "dd/mm/yyyy HH:MM",
             displayFormat: void 0,

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-be.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ca.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-nl.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ru.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-uk.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-us.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(factory) {

dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 !function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):window.dependencyLib=e(jQuery)}(function(e){return e});

dist/min/inputmask/global/document.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 "function"==typeof define&&define.amd?define(function(){return document}):"object"==typeof exports&&(module.exports=document);

dist/min/inputmask/global/window.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 4.0.0-52
+* Version: 4.0.0-53
 */
 
 "function"==typeof define&&define.amd?define(function(){return window}):"object"==typeof exports&&(module.exports=window);

js/inputmask.date.extensions.js

@@ -170,7 +170,7 @@
                 opts.min = analyseMask(opts.min, opts.inputFormat, opts);
                 opts.max = analyseMask(opts.max, opts.inputFormat, opts);
                 opts.regex = parse(opts.inputFormat, opts);
-                console.log(opts.regex);
+                // console.log(opts.regex);
                 return null; //migrate to regex mask
             },
             inputFormat: "dd/mm/yyyy HH:MM", //format used to input the date

js/inputmask.js

@@ -946,19 +946,18 @@
             resetMaskSet(true);
         }
 
-        function determineTestTemplate(tests, guessNextBest) {
+        function determineTestTemplate(pos, tests, guessNextBest) {
+            pos = pos > 0 ? pos - 1 : 0;
             var testPos,
-                testPositions = tests,
-                lvp = getLastValidPosition(),
-                lvTest = getMaskSet().validPositions[lvp] || getTests(0)[0],
-                lvTestAltArr = (lvTest.alternation !== undefined) ? lvTest.locator[lvTest.alternation].toString().split(",") : [];
-            for (var ndx = 0; ndx < testPositions.length; ndx++) {
-                testPos = testPositions[ndx];
+                altTest = getTest(pos),
+                altArr = (altTest.alternation !== undefined) ? altTest.locator[altTest.alternation].toString().split(",") : [];
+            for (var ndx = 0; ndx < tests.length; ndx++) {
+                testPos = tests[ndx];
 
                 if (testPos.match &&
                     (((opts.greedy && testPos.match.optionalQuantifier !== true) || (testPos.match.optionality === false || testPos.match.newBlockMarker === false) && testPos.match.optionalQuantifier !== true) &&
-                        ((lvTest.alternation === undefined || lvTest.alternation !== testPos.alternation) ||
-                            (testPos.locator[lvTest.alternation] !== undefined && checkAlternationMatch(testPos.locator[lvTest.alternation].toString().split(","), lvTestAltArr))))) {
+                        ((altTest.alternation === undefined || altTest.alternation !== testPos.alternation) ||
+                            (testPos.locator[altTest.alternation] !== undefined && checkAlternationMatch(testPos.locator[altTest.alternation].toString().split(","), altArr))))) {
 
                     if (guessNextBest !== true || (testPos.match.fn === null && !/[0-9a-bA-Z]/.test(testPos.match.def))) {
                         break;
@@ -970,7 +969,7 @@
         }
 
         function getTestTemplate(pos, ndxIntlzr, tstPs) {
-            return getMaskSet().validPositions[pos] || determineTestTemplate(getTests(pos, ndxIntlzr ? ndxIntlzr.slice() : ndxIntlzr, tstPs));
+            return getMaskSet().validPositions[pos] || determineTestTemplate(pos, getTests(pos, ndxIntlzr ? ndxIntlzr.slice() : ndxIntlzr, tstPs));
         }
 
         function getTest(pos) {
@@ -1105,6 +1104,7 @@
                                         altIndexArr.push(amndx);
                                     }
                                 }
+
                                 for (var ndx = 0; ndx < altIndexArr.length; ndx++) {
                                     amndx = parseInt(altIndexArr[ndx]);
                                     matches = [];
@@ -1112,16 +1112,19 @@
                                     ndxInitializer = resolveNdxInitializer(testPos, amndx, loopNdxCnt) || ndxInitializerClone.slice();
                                     match = handleMatch(alternateToken.matches[amndx] || maskToken.matches[amndx], [amndx].concat(loopNdx), quantifierRecurse) || match;
                                     if (match !== true && match !== undefined && (altIndexArr[altIndexArr.length - 1] < alternateToken.matches.length)) { //no match in the alternations (length mismatch) => look further
-                                        var ntndx = $.inArray(match, maskToken.matches) + 1;
-                                        if (maskToken.matches.length > ntndx) {
-                                            match = handleMatch(maskToken.matches[ntndx], [ntndx].concat(loopNdx.slice(1, loopNdx.length)), quantifierRecurse);
-                                            if (match) {
-                                                altIndexArr.push(ntndx.toString());
-                                                $.each(matches, function (ndx, lmnt) {
-                                                    lmnt.alternation = loopNdx.length - 1;
-                                                });
-                                            }
-                                        }
+                                        // ndx = altIndexArr.length;  //skip alternation
+
+                                        //TODO CHECK ME  IS THIS CORRECT???
+                                        // var ntndx = $.inArray(match, maskToken.matches) + 1;
+                                        // if (maskToken.matches.length > ntndx) {
+                                        //     match = handleMatch(maskToken.matches[ntndx], [ntndx].concat(loopNdx.slice(1, loopNdx.length)), quantifierRecurse);
+                                        //     if (match) {
+                                        //         altIndexArr.push(ntndx.toString());
+                                        //         $.each(matches, function (ndx, lmnt) {
+                                        //             lmnt.alternation = loopNdx.length - 1;
+                                        //         });
+                                        //     }
+                                        // }
                                     }
                                     maltMatches = matches.slice();
                                     testPos = currentPos;
@@ -1256,12 +1259,12 @@
                 }
             }
 
-            function mergeLocators(tests) {
+            function mergeLocators(pos, tests) {
                 var locator = [];
                 if (!$.isArray(tests)) tests = [tests];
                 if (tests.length > 0) {
                     if (tests[0].alternation === undefined) {
-                        locator = determineTestTemplate(tests.slice()).locator.slice();
+                        locator = determineTestTemplate(pos, tests.slice()).locator.slice();
                         if (locator.length === 0) locator = tests[0].locator.slice();
                     } else {
                         $.each(tests, function (ndx, tst) {
@@ -1288,11 +1291,11 @@
                             tests[0].match.optionalQuantifier !== true &&
                             tests[0].match.fn === null && !/[0-9a-bA-Z]/.test(tests[0].match.def)) {
                             if (getMaskSet().validPositions[pos - 1] === undefined) {
-                                return [determineTestTemplate(tests)];
+                                return [determineTestTemplate(pos, tests)];
                             } else if (getMaskSet().validPositions[pos - 1].alternation === tests[0].alternation) {
-                                return [determineTestTemplate(tests)];
+                                return [determineTestTemplate(pos, tests)];
                             } else if (getMaskSet().validPositions[pos - 1]) {
-                                return [determineTestTemplate(tests)];
+                                return [determineTestTemplate(pos, tests)];
                             }
                         }
                     }
@@ -1309,7 +1312,7 @@
                         previousPos--;
                     }
                     if (test !== undefined && previousPos > -1) {
-                        ndxInitializer = mergeLocators(test);
+                        ndxInitializer = mergeLocators(previousPos, test);
                         cacheDependency = ndxInitializer.join("");
                         testPos = previousPos;
                     }
@@ -1651,7 +1654,7 @@
                     for (var ps = originalPos; ps < newPos; ps++) {
                         if (getMaskSet().validPositions[ps] === undefined && !isMask(ps, true)) {
                             var tests = getTests(ps).slice(),
-                                bestMatch = determineTestTemplate(tests, true),
+                                bestMatch = determineTestTemplate(ps, tests, true),
                                 equality = -1;
                             if (tests[tests.length - 1].match.def === "") tests.pop();
                             $.each(tests, function (ndx, tst) { //find best matching
@@ -1758,7 +1761,7 @@
                     if (getMaskSet().validPositions[pndx] === undefined && (opts.jitMasking === false || opts.jitMasking > pndx)) {
                         testsFromPos = getTests(pndx, getTestTemplate(pndx - 1).locator, pndx - 1).slice();
                         if (testsFromPos[testsFromPos.length - 1].match.def === "") testsFromPos.pop();
-                        testTemplate = determineTestTemplate(testsFromPos);
+                        testTemplate = determineTestTemplate(pndx, testsFromPos);
                         if (testTemplate && (testTemplate.match.def === opts.radixPointDefinitionSymbol || !isMask(pndx, true) ||
                                 ($.inArray(opts.radixPoint, getBuffer()) < pndx && testTemplate.match.fn && testTemplate.match.fn.test(getPlaceholder(pndx), getMaskSet(), pndx, false, opts)))) {
                             result = _isValid(pndx, getPlaceholder(pndx, testTemplate.match, true) || (testTemplate.match.fn == null ? testTemplate.match.def : (getPlaceholder(pndx) !== "" ? getPlaceholder(pndx) : getBuffer()[pndx])), true);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "4.0.0-52",
+  "version": "4.0.0-53",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
   "main": "index.js",
   "files": [

qunit/tests_alternations.js

@@ -302,4 +302,15 @@ export default function (qunit, $, Inputmask) {
 		$("#testmask").Type("24");
 		assert.equal(testmask.inputmask._valueGet(), "2_", "Result " + testmask.inputmask._valueGet());
 	});
+
+    qunit.test("(1|2|3)/(4|5)", function (assert) {
+        var $fixture = $("#qunit-fixture");
+        $fixture.append('<input type="text" id="testmask" />');
+        var testmask = document.getElementById("testmask");
+
+        Inputmask("(1|2|3)/(4|5)").mask(testmask);
+        testmask.focus();
+        $("#testmask").Type("34");
+        assert.equal(testmask.inputmask._valueGet(), "3/4", "Result " + testmask.inputmask._valueGet());
+    });
 };