Skip to content
This repository was archived by the owner on Dec 11, 2017. It is now read-only.

Update jquery.maskedinput.js #252

Closed
Style87 wants to merge 3 commits into from
Closed

Update jquery.maskedinput.js #252

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93dfcaa
Update jquery.maskedinput.js
Style87 Sep 26, 2014
c49de01
Update jquery.maskedinput.js
Style87 Sep 26, 2014
d90c599
Update jquery.maskedinput.js
Style87 Sep 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 40 additions & 16 deletions src/jquery.maskedinput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ $.mask = {
},
autoclear: true,
dataName: "rawMaskFn",
placeholder: '_'
placeholder: '_',
shiftLeft: true,
shiftRight: true
};

$.fn.extend({
Expand Down Expand Up @@ -78,9 +80,28 @@ $.fn.extend({
settings = $.extend({
autoclear: $.mask.autoclear,
placeholder: $.mask.placeholder, // Load default placeholder
shiftLeft: $.mask.shiftLeft,
shiftRight: $.mask.shiftRight,
completed: null
}, settings);

// If placeholder is a single character set it for all applicable positions.
if (settings.placeholder.length == 1) {
var p = settings.placeholder;
settings.placeholder = '';
for (var i = 0, len = mask.length; i < len; i++) {
switch(mask[i]) {
case 'a':
case '9':
case '*':
case '~':
settings.placeholder += p;
break;
default:
settings.placeholder += mask[i];
}
}
}

defs = $.mask.definitions;
tests = [];
Expand All @@ -107,7 +128,7 @@ $.fn.extend({
mask.split(""),
function(c, i) {
if (c != '?') {
return defs[c] ? settings.placeholder : c;
return defs[c] ? settings.placeholder[i] : c;
}
}),
defaultBuffer = buffer.join(''),
Expand All @@ -131,33 +152,36 @@ $.fn.extend({
return;
}

for (i = begin, j = seekNext(end); i < len; i++) {
if (tests[i]) {
if (j < len && tests[i].test(buffer[j])) {
buffer[i] = buffer[j];
buffer[j] = settings.placeholder;
} else {
break;
if ( settings.shiftLeft ) {
for (i = begin, j = seekNext(end); i < len; i++) {
if (tests[i]) {
if (j < len && tests[i].test(buffer[j])) {
buffer[i] = buffer[j];
buffer[j] = settings.placeholder[j];
} else {
break;
}

j = seekNext(j);
}

j = seekNext(j);
}
}
writeBuffer();
input.caret(Math.max(firstNonMaskPos, begin));
}

function shiftR(pos) {
if (!settings.shiftRight) return;
var i,
c,
j,
t;

for (i = pos, c = settings.placeholder; i < len; i++) {
for (i = pos; i < len; i++) {
if (tests[i]) {
j = seekNext(i);
t = buffer[i];
buffer[i] = c;
buffer[i] = settings.placeholder[i];
if (j < len && tests[j].test(t)) {
c = t;
} else {
Expand Down Expand Up @@ -269,7 +293,7 @@ $.fn.extend({
var i;
for (i = start; i < end && i < len; i++) {
if (tests[i]) {
buffer[i] = settings.placeholder;
buffer[i] = settings.placeholder[i];
}
}
}
Expand All @@ -286,7 +310,7 @@ $.fn.extend({

for (i = 0, pos = 0; i < len; i++) {
if (tests[i]) {
buffer[i] = settings.placeholder;
buffer[i] = settings.placeholder[i];
while (pos++ < test.length) {
c = test.charAt(pos - 1);
if (tests[i].test(c)) {
Expand Down Expand Up @@ -325,7 +349,7 @@ $.fn.extend({

input.data($.mask.dataName,function(){
return $.map(buffer, function(c, i) {
return tests[i]&&c!=settings.placeholder ? c : null;
return tests[i]&&c!=settings.placeholder[i] ? c : null;
}).join('');
});

Expand Down