浏览代码

mask email and clearIncomplete: true have bug fix #802

Robin Herbots 11 年之前
父节点
当前提交
8a216b52b8

+ 1 - 1
dist/inputmask/jquery.inputmask.js

@@ -640,7 +640,7 @@
                 complete = !0;
                 for (var i = 0; aml >= i; i++) {
                     var mask = isMask(i);
-                    if (mask && (void 0 == buffer[i] || buffer[i] == getPlaceholder(i)) || !mask && buffer[i] != getPlaceholder(i)) {
+                    if (mask && void 0 == getMaskSet().validPositions[i] || !mask && buffer[i] != getPlaceholder(i)) {
                         complete = !1;
                         break;
                     }

文件差异内容过多而无法显示
+ 1 - 1
dist/inputmask/jquery.inputmask.min.js


+ 1 - 1
dist/jquery.inputmask.bundle.js

@@ -638,7 +638,7 @@
                 complete = !0;
                 for (var i = 0; aml >= i; i++) {
                     var mask = isMask(i);
-                    if (mask && (void 0 == buffer[i] || buffer[i] == getPlaceholder(i)) || !mask && buffer[i] != getPlaceholder(i)) {
+                    if (mask && void 0 == getMaskSet().validPositions[i] || !mask && buffer[i] != getPlaceholder(i)) {
                         complete = !1;
                         break;
                     }

文件差异内容过多而无法显示
+ 1 - 1
dist/jquery.inputmask.bundle.min.js


+ 1 - 1
js/jquery.inputmask.js

@@ -1141,7 +1141,7 @@
                     complete = true;
                     for (var i = 0; i <= aml; i++) {
                         var mask = isMask(i);
-                        if ((mask && (buffer[i] == undefined || buffer[i] == getPlaceholder(i))) || (!mask && buffer[i] != getPlaceholder(i))) {
+                        if ((mask && getMaskSet()["validPositions"][i] == undefined) || (!mask && buffer[i] != getPlaceholder(i))) {
                             complete = false;
                             break;
                         }

+ 7 - 2
qunit/tests_formatvalidate.js

@@ -120,12 +120,12 @@ test("YoussefTaghlabi isValid(\"12,345.67\", { alias: \"decimal\" }", function (
 });
 
 test("thomstark isValid(\"12lbs\", {mask:\"99[9]lb\\s\", greedy:false, skipOptionalPartCharacter: \"\", \"clearIncomplete\":true}", function () {
-    var isValid = $.inputmask.isValid("12lbs", {mask:"99[9]lb\\s", greedy:false, skipOptionalPartCharacter: "", "clearIncomplete":true});
+    var isValid = $.inputmask.isValid("12lbs", { mask: "99[9]lb\\s", greedy: false, skipOptionalPartCharacter: "", "clearIncomplete": true });
     equal(isValid, true, "Result " + isValid);
 });
 
 test("thomstark isValid(\"1'2\"\", {mask:\"9'9[9]\"\", greedy:false, skipOptionalPartCharacter: \"\", \"clearIncomplete\":true}", function () {
-    var isValid = $.inputmask.isValid("1'2\"", {mask:"9'9[9]\"", greedy:false, skipOptionalPartCharacter: "", "clearIncomplete":true});
+    var isValid = $.inputmask.isValid("1'2\"", { mask: "9'9[9]\"", greedy: false, skipOptionalPartCharacter: "", "clearIncomplete": true });
     equal(isValid, true, "Result " + isValid);
 });
 
@@ -138,3 +138,8 @@ test("thomstark isValid(\"9'9{1,2}\", {mask:\"9'9[9]\"\", greedy:false, skipOpti
     var isValid = $.inputmask.isValid("1'2\"", { mask: "9'9{1,2}\"", greedy: false, skipOptionalPartCharacter: "", "clearIncomplete": true });
     equal(isValid, true, "Result " + isValid);
 });
+
+test("a13x3y isValid(\"some_body@mail.com\", {alias:\"email\"}", function () {
+    var isValid = $.inputmask.isValid("some_body@mail.com", { alias: "email" });
+    equal(isValid, true, "Result " + isValid);
+});