From fd2514d29ead3e0bc033c0842f06d0ba53393d18 Mon Sep 17 00:00:00 2001 From: Rich Archer Date: Mon, 6 Feb 2017 17:34:54 +0200 Subject: [PATCH] Allowing .masked check to determine typeof string --- js/input-mask.ie8.min.js | 2 +- js/input-mask.min.js | 2 +- js/masking-input.ie8support.js | 2 +- js/masking-input.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/input-mask.ie8.min.js b/js/input-mask.ie8.min.js index 22556bb..1747e46 100644 --- a/js/input-mask.ie8.min.js +++ b/js/input-mask.ie8.min.js @@ -1 +1 @@ -var InputMask=function(e){e&&e.masked&&(e.masked=typeof e.masked===string?document.querySelectorAll(e.masked):e.masked),e?this.options={masked:e.masked||document.querySelectorAll(this.defaults.masked),maskedNumber:e.maskedNumber||this.defaults.maskedNumber,maskedLetter:e.maskedLetter||this.defaults.maskedLetter,error:e.onError||this.defaults.onError}:(this.options=this.defaults,this.options.masked=document.querySelectorAll(this.options.masked)),this.refresh(!0)},inputMask={defaults:{masked:".masked",maskedNumber:"XdDmMyY9",maskedLetter:"_",noValidate:"",onError:function(){}},refresh:function(e){var t,a;for(e||(this.options.masked=document.querySelectorAll(this.options.masked)),i=0;i"+t+""+a.substr(t.length)},activateMasking:function(e){var t=this;e.addEventListener?e.addEventListener("keyup",function(e){t.handleValueChange.call(t,e)},!1):e.attachEvent&&e.attachEvent("onkeyup",function(e){e.target=e.srcElement,t.handleValueChange.call(t,e)})},handleValueChange:function(e){var t=e.target.getAttribute("id");e.target.value!=document.querySelector("#"+t+"Mask i").innerHTML&&(document.getElementById(t).value=this.handleCurrentValue(e),document.getElementById(t+"Mask").innerHTML=this.setValueOfMask(e))},handleCurrentValue:function(e){var t,a,r,s,n,i=e.target.getAttribute("data-charset"),o=i||e.target.getAttribute("data-placeholder"),d=e.target.value,u=o.length,l="";for(n=i?d.replace(/\W/g,""):d.replace(/\D/g,""),t=0,a=0;u>t;t++){if(r=!isNaN(parseInt(n[a])),s=n[a]?n[a].match(/[A-Z]/i):!1,matchesNumber=this.options.maskedNumber.indexOf(o[t])>=0,matchesLetter=this.options.maskedLetter.indexOf(o[t])>=0,matchesNumber&&r||i&&matchesLetter&&s)l+=n[a++];else{if(!i&&!r&&matchesNumber||i&&(matchesLetter&&!s||matchesNumber&&!r))return l;l+=o[t]}if(void 0==n[a])break}return e.target.getAttribute("data-valid-example")?this.validateProgress(e,l):l},validateProgress:function(e,t){var a=e.target.getAttribute("data-valid-example"),r=new RegExp(e.target.getAttribute("pattern")),s=e.target.getAttribute("data-placeholder"),n=t.length,o="";if(1==n&&"MM"==s.toUpperCase().substr(0,2))return t>1&&10>t&&(t="0"+t),t;for(i=n;i>=0;i--){if(o=t+a.substr(t.length),r.test(o))return t;t=t.substr(0,t.length-1)}return t}};for(var property in inputMask)inputMask.hasOwnProperty(property)&&(InputMask.prototype[property]=inputMask[property]);!function(){var e=document.getElementsByTagName("script"),t=e[e.length-1];t.getAttribute("data-autoinit")&&new InputMask}(); +var InputMask=function(e){e&&e.masked&&(e.masked=typeof e.masked==="string"?document.querySelectorAll(e.masked):e.masked),e?this.options={masked:e.masked||document.querySelectorAll(this.defaults.masked),maskedNumber:e.maskedNumber||this.defaults.maskedNumber,maskedLetter:e.maskedLetter||this.defaults.maskedLetter,error:e.onError||this.defaults.onError}:(this.options=this.defaults,this.options.masked=document.querySelectorAll(this.options.masked)),this.refresh(!0)},inputMask={defaults:{masked:".masked",maskedNumber:"XdDmMyY9",maskedLetter:"_",noValidate:"",onError:function(){}},refresh:function(e){var t,a;for(e||(this.options.masked=document.querySelectorAll(this.options.masked)),i=0;i"+t+""+a.substr(t.length)},activateMasking:function(e){var t=this;e.addEventListener?e.addEventListener("keyup",function(e){t.handleValueChange.call(t,e)},!1):e.attachEvent&&e.attachEvent("onkeyup",function(e){e.target=e.srcElement,t.handleValueChange.call(t,e)})},handleValueChange:function(e){var t=e.target.getAttribute("id");e.target.value!=document.querySelector("#"+t+"Mask i").innerHTML&&(document.getElementById(t).value=this.handleCurrentValue(e),document.getElementById(t+"Mask").innerHTML=this.setValueOfMask(e))},handleCurrentValue:function(e){var t,a,r,s,n,i=e.target.getAttribute("data-charset"),o=i||e.target.getAttribute("data-placeholder"),d=e.target.value,u=o.length,l="";for(n=i?d.replace(/\W/g,""):d.replace(/\D/g,""),t=0,a=0;u>t;t++){if(r=!isNaN(parseInt(n[a])),s=n[a]?n[a].match(/[A-Z]/i):!1,matchesNumber=this.options.maskedNumber.indexOf(o[t])>=0,matchesLetter=this.options.maskedLetter.indexOf(o[t])>=0,matchesNumber&&r||i&&matchesLetter&&s)l+=n[a++];else{if(!i&&!r&&matchesNumber||i&&(matchesLetter&&!s||matchesNumber&&!r))return l;l+=o[t]}if(void 0==n[a])break}return e.target.getAttribute("data-valid-example")?this.validateProgress(e,l):l},validateProgress:function(e,t){var a=e.target.getAttribute("data-valid-example"),r=new RegExp(e.target.getAttribute("pattern")),s=e.target.getAttribute("data-placeholder"),n=t.length,o="";if(1==n&&"MM"==s.toUpperCase().substr(0,2))return t>1&&10>t&&(t="0"+t),t;for(i=n;i>=0;i--){if(o=t+a.substr(t.length),r.test(o))return t;t=t.substr(0,t.length-1)}return t}};for(var property in inputMask)inputMask.hasOwnProperty(property)&&(InputMask.prototype[property]=inputMask[property]);!function(){var e=document.getElementsByTagName("script"),t=e[e.length-1];t.getAttribute("data-autoinit")&&new InputMask}(); \ No newline at end of file diff --git a/js/input-mask.min.js b/js/input-mask.min.js index d749d11..0c6b528 100644 --- a/js/input-mask.min.js +++ b/js/input-mask.min.js @@ -1 +1 @@ -var InputMask=function(a){a&&a.masked&&(a.masked=typeof a.masked===string?document.querySelectorAll(a.masked):a.masked),a?this.opts={masked:a.masked||document.querySelectorAll(this.d.masked),mNum:a.mNum||this.d.mNum,mChar:a.mChar||this.d.mChar,error:a.onError||this.d.onError}:(this.opts=this.d,this.opts.masked=document.querySelectorAll(this.opts.masked)),this.refresh(!0)},inputMask={d:{masked:".masked",mNum:"XdDmMyY9",mChar:"_",onError:function(){}},refresh:function(a){var b,c;for(a||(this.opts.masked=document.querySelectorAll(this.opts.masked)),i=0;i"+b+""+c.substr(b.length)},activateMasking:function(a){var b=this;a.addEventListener?a.addEventListener("keyup",function(a){b.handleValueChange.call(b,a)},!1):a.attachEvent&&a.attachEvent("onkeyup",function(a){a.target=a.srcElement,b.handleValueChange.call(b,a)})},handleValueChange:function(a){var b=a.target.getAttribute("id");a.target.value!=document.querySelector("#"+b+"Mask i").innerHTML&&(document.getElementById(b).value=this.handleCurrentValue(a),document.getElementById(b+"Mask").innerHTML=this.setValueOfMask(a))},handleCurrentValue:function(a){var g,h,i,j,k,b=a.target.getAttribute("data-charset"),c=b||a.target.getAttribute("data-placeholder"),d=a.target.value,e=c.length,f="";for(k=b?d.replace(/\W/g,""):d.replace(/\D/g,""),g=0,h=0;g=0,matchesLetter=this.opts.mChar.indexOf(c[g])>=0,matchesNumber&&i||b&&matchesLetter&&j)f+=k[h++];else{if(!b&&!i&&matchesNumber||b&&(matchesLetter&&!j||matchesNumber&&!i))return f;f+=c[g]}if(void 0==k[h])break}return a.target.getAttribute("data-valid-example")?this.validateProgress(a,f):f},validateProgress:function(a,b){var c=a.target.getAttribute("data-valid-example"),d=new RegExp(a.target.getAttribute("pattern")),e=a.target.getAttribute("data-placeholder"),f=b.length,g="";if(1==f&&"MM"==e.toUpperCase().substr(0,2))return b>1&&b<10&&(b="0"+b),b;for(i=f;i>=0;i--){if(g=b+c.substr(b.length),d.test(g))return b;b=b.substr(0,b.length-1)}return b}};for(var property in inputMask)inputMask.hasOwnProperty(property)&&(InputMask.prototype[property]=inputMask[property]);!function(){var a=document.getElementsByTagName("script"),b=a[a.length-1];b.getAttribute("data-autoinit")&&new InputMask}(); \ No newline at end of file +var InputMask=function(a){a&&a.masked&&(a.masked=typeof a.masked==="string"?document.querySelectorAll(a.masked):a.masked),a?this.opts={masked:a.masked||document.querySelectorAll(this.d.masked),mNum:a.mNum||this.d.mNum,mChar:a.mChar||this.d.mChar,error:a.onError||this.d.onError}:(this.opts=this.d,this.opts.masked=document.querySelectorAll(this.opts.masked)),this.refresh(!0)},inputMask={d:{masked:".masked",mNum:"XdDmMyY9",mChar:"_",onError:function(){}},refresh:function(a){var b,c;for(a||(this.opts.masked=document.querySelectorAll(this.opts.masked)),i=0;i"+b+""+c.substr(b.length)},activateMasking:function(a){var b=this;a.addEventListener?a.addEventListener("keyup",function(a){b.handleValueChange.call(b,a)},!1):a.attachEvent&&a.attachEvent("onkeyup",function(a){a.target=a.srcElement,b.handleValueChange.call(b,a)})},handleValueChange:function(a){var b=a.target.getAttribute("id");a.target.value!=document.querySelector("#"+b+"Mask i").innerHTML&&(document.getElementById(b).value=this.handleCurrentValue(a),document.getElementById(b+"Mask").innerHTML=this.setValueOfMask(a))},handleCurrentValue:function(a){var g,h,i,j,k,b=a.target.getAttribute("data-charset"),c=b||a.target.getAttribute("data-placeholder"),d=a.target.value,e=c.length,f="";for(k=b?d.replace(/\W/g,""):d.replace(/\D/g,""),g=0,h=0;g=0,matchesLetter=this.opts.mChar.indexOf(c[g])>=0,matchesNumber&&i||b&&matchesLetter&&j)f+=k[h++];else{if(!b&&!i&&matchesNumber||b&&(matchesLetter&&!j||matchesNumber&&!i))return f;f+=c[g]}if(void 0==k[h])break}return a.target.getAttribute("data-valid-example")?this.validateProgress(a,f):f},validateProgress:function(a,b){var c=a.target.getAttribute("data-valid-example"),d=new RegExp(a.target.getAttribute("pattern")),e=a.target.getAttribute("data-placeholder"),f=b.length,g="";if(1==f&&"MM"==e.toUpperCase().substr(0,2))return b>1&&b<10&&(b="0"+b),b;for(i=f;i>=0;i--){if(g=b+c.substr(b.length),d.test(g))return b;b=b.substr(0,b.length-1)}return b}};for(var property in inputMask)inputMask.hasOwnProperty(property)&&(InputMask.prototype[property]=inputMask[property]);!function(){var a=document.getElementsByTagName("script"),b=a[a.length-1];b.getAttribute("data-autoinit")&&new InputMask}(); \ No newline at end of file diff --git a/js/masking-input.ie8support.js b/js/masking-input.ie8support.js index 96bc974..0928a83 100644 --- a/js/masking-input.ie8support.js +++ b/js/masking-input.ie8support.js @@ -1,7 +1,7 @@ var InputMask = function ( options ) { if ( options && options.masked ) { // Make it easy to wrap this plugin and pass elements instead of a selector - options.masked = typeof options.masked === string ? document.querySelectorAll( options.masked ) : options.masked; + options.masked = typeof options.masked === 'string' ? document.querySelectorAll( options.masked ) : options.masked; } if ( options ) { diff --git a/js/masking-input.js b/js/masking-input.js index f5a9ff6..3363997 100644 --- a/js/masking-input.js +++ b/js/masking-input.js @@ -1,7 +1,7 @@ var InputMask = function ( opts ) { if ( opts && opts.masked ) { // Make it easy to wrap this plugin and pass elements instead of a selector - opts.masked = typeof opts.masked === string ? document.querySelectorAll( opts.masked ) : opts.masked; + opts.masked = typeof opts.masked === 'string' ? document.querySelectorAll( opts.masked ) : opts.masked; } if ( opts ) {