Browse Source

Merge branch '1.x' into 2.x

Robin Herbots 12 years ago
parent
commit
493142647f

BIN
dist/jQuery.InputMask.2.1.8.nupkg


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

@@ -616,12 +616,12 @@
 
             function clearOptionalTail(input, buffer) {
                 checkVal(input, buffer, false);
-                var tmpBuffer = buffer.slice();
+                var tmpBuffer = buffer.slice(), testPos, pos;
                 if ($(input).data('inputmask')['isRTL']) {
                     for (var pos = 0; pos <= tmpBuffer.length - 1; pos++) {
                         var testPos = determineTestPosition(pos);
                         if (getActiveTests()[testPos].optionality) {
-                            if (getPlaceHolder(pos) == buffer[pos] || !isMask(pos))
+                            if (!isMask(pos) || !isValid(pos, buffer[pos], buffer, true))
                                 tmpBuffer.splice(0, 1);
                             else break;
                         } else break;
@@ -630,7 +630,7 @@
                     for (var pos = tmpBuffer.length - 1; pos >= 0; pos--) {
                         var testPos = determineTestPosition(pos);
                         if (getActiveTests()[testPos].optionality) {
-                            if (getPlaceHolder(pos) == buffer[pos] || !isMask(pos))
+                            if (!isMask(pos) || !isValid(pos, buffer[pos], buffer, true))
                                 tmpBuffer.pop();
                             else break;
                         } else break;

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


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


+ 3 - 3
js/jquery.inputmask.js

@@ -616,12 +616,12 @@
 
             function clearOptionalTail(input, buffer) {
                 checkVal(input, buffer, false);
-                var tmpBuffer = buffer.slice();
+                var tmpBuffer = buffer.slice(), testPos, pos;
                 if ($(input).data('inputmask')['isRTL']) {
                     for (var pos = 0; pos <= tmpBuffer.length - 1; pos++) {
                         var testPos = determineTestPosition(pos);
                         if (getActiveTests()[testPos].optionality) {
-                            if (getPlaceHolder(pos) == buffer[pos] || !isMask(pos))
+                            if (!isMask(pos) || !isValid(pos, buffer[pos], buffer, true))
                                 tmpBuffer.splice(0, 1);
                             else break;
                         } else break;
@@ -630,7 +630,7 @@
                     for (var pos = tmpBuffer.length - 1; pos >= 0; pos--) {
                         var testPos = determineTestPosition(pos);
                         if (getActiveTests()[testPos].optionality) {
-                            if (getPlaceHolder(pos) == buffer[pos] || !isMask(pos))
+                            if (!isMask(pos) || !isValid(pos, buffer[pos], buffer, true))
                                 tmpBuffer.pop();
                             else break;
                         } else break;