Skip to content

Fix issue initial value and emphasis still visible #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue initial value and emphasis still visible #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 32 additions & 28 deletions js/masking-input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var InputMask = function ( opts ) {
masked: opts.masked || document.querySelectorAll( this.d.masked ),
mNum: opts.mNum || this.d.mNum,
mChar: opts.mChar || this.d.mChar,
error: opts.onError || this.d.onError
}
error: opts.onError || this.d.onError,
};
} else {
this.opts = this.d;
this.opts.masked = document.querySelectorAll( this.opts.masked );
Expand All @@ -37,7 +37,7 @@ var inputMask = {
}

for(i = 0; i < this.opts.masked.length; i++) {
t = this.opts.masked[i]
t = this.opts.masked[i];
parentClass = t.parentNode.getAttribute('class');

if ( !parentClass || ( parentClass && parentClass.indexOf('shell') === -1 ) ) {
Expand All @@ -47,6 +47,13 @@ var inputMask = {
}
},

setValueOfMask: function (t) {
var value = t.value,
placeholder = t.getAttribute('data-placeholder');

return '<i>' + value + '</i>' + placeholder.substr(value.length);
},

// replaces each masked t with a shall containing the t and it's mask.
createShell : function (t) {
var wrap = document.createElement('span'),
Expand Down Expand Up @@ -74,13 +81,10 @@ var inputMask = {
wrap.appendChild(mask);
t.parentNode.insertBefore( wrap, t );
wrap.appendChild(t);
},

setValueOfMask : function (e) {
var value = e.target.value,
placeholder = e.target.getAttribute('data-placeholder');

return "<i>" + value + "</i>" + placeholder.substr(value.length);
if (t.value.length > 0) {
mask.innerHTML = this.setValueOfMask(t);
}
},

// add event listeners
Expand All @@ -91,7 +95,7 @@ var inputMask = {
that.handleValueChange.call(that,e);
}, false);
} else if (t.attachEvent) { // For IE 8
t.attachEvent('onkeyup', function(e) {
t.attachEvent('onkeyup', function(e) {
e.target = e.srcElement;
that.handleValueChange.call(that, e);
});
Expand All @@ -106,7 +110,7 @@ var inputMask = {
}

document.getElementById(id).value = this.handleCurrentValue(e);
document.getElementById(id + 'Mask').innerHTML = this.setValueOfMask(e);
document.getElementById(id + 'Mask').innerHTML = this.setValueOfMask(e.target);

},

Expand All @@ -117,25 +121,25 @@ var inputMask = {
i, j, isInt, isLetter, strippedValue;

// strip special characters
strippedValue = isCharsetPresent ? value.replace(/\W/g, "") : value.replace(/\D/g, "");
strippedValue = isCharsetPresent ? value.replace(/\W/g, '') : value.replace(/\D/g, '');

for (i = 0, j = 0; i < l; i++) {
isInt = !isNaN(parseInt(strippedValue[j]));
isLetter = strippedValue[j] ? strippedValue[j].match(/[A-Z]/i) : false;
matchesNumber = this.opts.mNum.indexOf(placeholder[i]) >= 0;
matchesLetter = this.opts.mChar.indexOf(placeholder[i]) >= 0;
if ((matchesNumber && isInt) || (isCharsetPresent && matchesLetter && isLetter)) {
newValue += strippedValue[j++];
} else if ((!isCharsetPresent && !isInt && matchesNumber) || (isCharsetPresent && ((matchesLetter && !isLetter) || (matchesNumber && !isInt)))) {
//this.opts.onError( e ); // write your own error handling function
return newValue;
} else {
newValue += placeholder[i];
}
// break if no characters left and the pattern is non-special character
if (strippedValue[j] == undefined) {
break;
}
isInt = !isNaN(parseInt(strippedValue[j]));
isLetter = strippedValue[j] ? strippedValue[j].match(/[A-Z]/i) : false;
matchesNumber = this.opts.mNum.indexOf(placeholder[i]) >= 0;
matchesLetter = this.opts.mChar.indexOf(placeholder[i]) >= 0;
if ((matchesNumber && isInt) || (isCharsetPresent && matchesLetter && isLetter)) {
newValue += strippedValue[j++];
} else if ((!isCharsetPresent && !isInt && matchesNumber) || (isCharsetPresent && ((matchesLetter && !isLetter) || (matchesNumber && !isInt)))) {
//this.opts.onError( e ); // write your own error handling function
return newValue;
} else {
newValue += placeholder[i];
}
// break if no characters left and the pattern is non-special character
if (strippedValue[j] == undefined) {
break;
}
}
if (e.target.getAttribute('data-valid-example')) {
return this.validateProgress(e, newValue);
Expand Down