Browse Source

fix in backspace + fix for emptyu masks

Robin Herbots 12 years ago
parent
commit
475f1f6990

+ 1 - 1
build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 
 build.major = 2
 build.major = 2
 build.minor = 4
 build.minor = 4
-build.revision = 0
+build.revision = 1
 
 
 target = jquery.inputmask.bundle.js
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js
 target.min = jquery.inputmask.bundle.min.js

+ 1 - 1
component.json

@@ -1,6 +1,6 @@
 {
 {
     "name": "jquery.inputmask",
     "name": "jquery.inputmask",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "main": "./dist/jquery.inputmask.bundle.js",
     "main": "./dist/jquery.inputmask.bundle.js",
     "dependencies": {
     "dependencies": {
         "jquery": ">=1.7"
         "jquery": ">=1.7"

BIN
dist/jQuery.InputMask.2.4.0.nupkg


BIN
dist/jQuery.InputMask.2.4.1.nupkg


+ 14 - 12
dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2013 Robin Herbots
 * Copyright (c) 2010 - 2013 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 2.4.0
+* Version: 2.4.1
 */
 */
 
 
 (function ($) {
 (function ($) {
@@ -101,6 +101,7 @@
                         //resolve possible aliases given by options
                         //resolve possible aliases given by options
                         resolveAlias(opts.alias, options);
                         resolveAlias(opts.alias, options);
                         masksets = generateMaskSets();
                         masksets = generateMaskSets();
+                        if (masksets.length == 0) { return this; }
 
 
                         return this.each(function () {
                         return this.each(function () {
                             maskScope($.extend(true, {}, masksets), 0).mask(this);
                             maskScope($.extend(true, {}, masksets), 0).mask(this);
@@ -184,7 +185,7 @@
                             opts.mask = fn;
                             opts.mask = fn;
                         }
                         }
                         masksets = generateMaskSets();
                         masksets = generateMaskSets();
-
+                        if (masksets.length == 0) { return this; }
                         return this.each(function () {
                         return this.each(function () {
                             maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                             maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                         });
                         });
@@ -196,7 +197,7 @@
 
 
                 resolveAlias(opts.alias, fn); //resolve aliases
                 resolveAlias(opts.alias, fn); //resolve aliases
                 masksets = generateMaskSets();
                 masksets = generateMaskSets();
-
+                if (masksets.length == 0) { return this; }
                 return this.each(function () {
                 return this.each(function () {
                     maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                     maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                 });
                 });
@@ -434,7 +435,7 @@
                     var masks = splitFirstOptionalStartPart(maskParts[0]);
                     var masks = splitFirstOptionalStartPart(maskParts[0]);
                     if (masks.length > 1) {
                     if (masks.length > 1) {
                         newMask = maskPrefix + masks[0] + markOptional(masks[1]) + (maskParts.length > 1 ? maskParts[1] : "");
                         newMask = maskPrefix + masks[0] + markOptional(masks[1]) + (maskParts.length > 1 ? maskParts[1] : "");
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -449,7 +450,7 @@
                             });
                             });
                         }
                         }
                         newMask = maskPrefix + masks[0] + (maskParts.length > 1 ? maskParts[1] : "");
                         newMask = maskPrefix + masks[0] + (maskParts.length > 1 ? maskParts[1] : "");
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -473,7 +474,7 @@
                     }
                     }
                     else {
                     else {
                         newMask = maskPrefix + maskParts;
                         newMask = maskPrefix + maskParts;
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -584,6 +585,7 @@
                                         for (var i = pos; i < lowestPos; i++) {
                                         for (var i = pos; i < lowestPos; i++) {
                                             rsltValid = _isValid(i, masksets[rslt["activeMasksetIndex"]], masksets[lowestIndex]["buffer"][i], true);
                                             rsltValid = _isValid(i, masksets[rslt["activeMasksetIndex"]], masksets[lowestIndex]["buffer"][i], true);
                                             if (rsltValid === false) {
                                             if (rsltValid === false) {
+                                                masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = lowestPos - 1;
                                                 break;
                                                 break;
                                             } else {
                                             } else {
                                                 setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], i, masksets[lowestIndex]["buffer"][i], true);
                                                 setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], i, masksets[lowestIndex]["buffer"][i], true);
@@ -1396,7 +1398,7 @@
                         }
                         }
                         var firstMaskPos = seekNext(-1);
                         var firstMaskPos = seekNext(-1);
                         clearBuffer(getActiveBuffer(), pos.begin, pos.end, true);
                         clearBuffer(getActiveBuffer(), pos.begin, pos.end, true);
-                        checkVal(input, false, masksets[1] == undefined, getActiveBuffer());
+                        checkVal(input, false, masksets[1] == undefined || firstMaskPos >= pos.end, getActiveBuffer());
                         if (getActiveMaskSet()['lastValidPosition'] < firstMaskPos) {
                         if (getActiveMaskSet()['lastValidPosition'] < firstMaskPos) {
                             getActiveMaskSet()["lastValidPosition"] = -1;
                             getActiveMaskSet()["lastValidPosition"] = -1;
                             getActiveMaskSet()["p"] = firstMaskPos;
                             getActiveMaskSet()["p"] = firstMaskPos;
@@ -1643,7 +1645,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.4.0
+Version: 2.4.1
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -1765,7 +1767,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2012 Robin Herbots
 Copyright (c) 2010 - 2012 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.4.0
+Version: 2.4.1
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -2249,7 +2251,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.4.0
+Version: 2.4.1
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -2426,7 +2428,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.4.0
+Version: 2.4.1
 
 
 Regex extensions on the jquery.inputmask base
 Regex extensions on the jquery.inputmask base
 Allows for using regular expressions as a mask
 Allows for using regular expressions as a mask
@@ -2596,7 +2598,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.4.0
+Version: 2.4.1
 
 
 Phone extension.
 Phone extension.
 When using this extension make sure you specify the correct url to get the masks
 When using this extension make sure you specify the correct url to get the masks

File diff suppressed because it is too large
+ 48 - 48
dist/jquery.inputmask.bundle.min.js


File diff suppressed because it is too large
+ 47 - 47
dist/min/jquery.inputmask.js


+ 1 - 1
jquery.inputmask.jquery.json

@@ -8,7 +8,7 @@
 		"inputmask",
 		"inputmask",
 		"mask"
 		"mask"
     ],
     ],
-    "version": "2.4.0",
+    "version": "2.4.1",
     "author": {
     "author": {
         "name": "Robin Herbots",
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"
         "url": "http://github.com/RobinHerbots/jquery.inputmask"

+ 8 - 6
js/jquery.inputmask.js

@@ -101,6 +101,7 @@
                         //resolve possible aliases given by options
                         //resolve possible aliases given by options
                         resolveAlias(opts.alias, options);
                         resolveAlias(opts.alias, options);
                         masksets = generateMaskSets();
                         masksets = generateMaskSets();
+                        if (masksets.length == 0) { return this; }
 
 
                         return this.each(function () {
                         return this.each(function () {
                             maskScope($.extend(true, {}, masksets), 0).mask(this);
                             maskScope($.extend(true, {}, masksets), 0).mask(this);
@@ -184,7 +185,7 @@
                             opts.mask = fn;
                             opts.mask = fn;
                         }
                         }
                         masksets = generateMaskSets();
                         masksets = generateMaskSets();
-
+                        if (masksets.length == 0) { return this; }
                         return this.each(function () {
                         return this.each(function () {
                             maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                             maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                         });
                         });
@@ -196,7 +197,7 @@
 
 
                 resolveAlias(opts.alias, fn); //resolve aliases
                 resolveAlias(opts.alias, fn); //resolve aliases
                 masksets = generateMaskSets();
                 masksets = generateMaskSets();
-
+                if (masksets.length == 0) { return this; }
                 return this.each(function () {
                 return this.each(function () {
                     maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                     maskScope($.extend(true, {}, masksets), activeMasksetIndex).mask(this);
                 });
                 });
@@ -434,7 +435,7 @@
                     var masks = splitFirstOptionalStartPart(maskParts[0]);
                     var masks = splitFirstOptionalStartPart(maskParts[0]);
                     if (masks.length > 1) {
                     if (masks.length > 1) {
                         newMask = maskPrefix + masks[0] + markOptional(masks[1]) + (maskParts.length > 1 ? maskParts[1] : "");
                         newMask = maskPrefix + masks[0] + markOptional(masks[1]) + (maskParts.length > 1 ? maskParts[1] : "");
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -449,7 +450,7 @@
                             });
                             });
                         }
                         }
                         newMask = maskPrefix + masks[0] + (maskParts.length > 1 ? maskParts[1] : "");
                         newMask = maskPrefix + masks[0] + (maskParts.length > 1 ? maskParts[1] : "");
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -473,7 +474,7 @@
                     }
                     }
                     else {
                     else {
                         newMask = maskPrefix + maskParts;
                         newMask = maskPrefix + maskParts;
-                        if ($.inArray(newMask, genmasks) == -1) {
+                        if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
                             genmasks.push(newMask);
                             genmasks.push(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             maskTemplate = getMaskTemplate(newMask);
                             ms.push({
                             ms.push({
@@ -584,6 +585,7 @@
                                         for (var i = pos; i < lowestPos; i++) {
                                         for (var i = pos; i < lowestPos; i++) {
                                             rsltValid = _isValid(i, masksets[rslt["activeMasksetIndex"]], masksets[lowestIndex]["buffer"][i], true);
                                             rsltValid = _isValid(i, masksets[rslt["activeMasksetIndex"]], masksets[lowestIndex]["buffer"][i], true);
                                             if (rsltValid === false) {
                                             if (rsltValid === false) {
+                                                masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = lowestPos - 1;
                                                 break;
                                                 break;
                                             } else {
                                             } else {
                                                 setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], i, masksets[lowestIndex]["buffer"][i], true);
                                                 setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], i, masksets[lowestIndex]["buffer"][i], true);
@@ -1396,7 +1398,7 @@
                         }
                         }
                         var firstMaskPos = seekNext(-1);
                         var firstMaskPos = seekNext(-1);
                         clearBuffer(getActiveBuffer(), pos.begin, pos.end, true);
                         clearBuffer(getActiveBuffer(), pos.begin, pos.end, true);
-                        checkVal(input, false, masksets[1] == undefined, getActiveBuffer());
+                        checkVal(input, false, masksets[1] == undefined || firstMaskPos >= pos.end, getActiveBuffer());
                         if (getActiveMaskSet()['lastValidPosition'] < firstMaskPos) {
                         if (getActiveMaskSet()['lastValidPosition'] < firstMaskPos) {
                             getActiveMaskSet()["lastValidPosition"] = -1;
                             getActiveMaskSet()["lastValidPosition"] = -1;
                             getActiveMaskSet()["p"] = firstMaskPos;
                             getActiveMaskSet()["p"] = firstMaskPos;