From b88d4fab082887d2b77f3f355a8026a4103d1ad9 Mon Sep 17 00:00:00 2001
From: Alexander Shabunevich <loonar@gmail.com>
Date: Sat, 1 Feb 2020 17:31:11 +0300
Subject: [PATCH] Fix bug with mask dataset checks

---
 dist/maska.js | 2 +-
 src/maska.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/maska.js b/dist/maska.js
index 47420dd..2054e71 100644
--- a/dist/maska.js
+++ b/dist/maska.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("Maska",[],t):"object"==typeof exports?exports.Maska=t():e.Maska=t()}(window,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";function r(e,t,n){var r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];return o(t).length>1?function(e){var t=o(e).sort((function(e,t){return e.length-t.length}));return function(e,n,r){for(var o=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],u=0;u<t.length;){var i=t[u];u++;var s=t[u];if(!(s&&a(e,s,r,!0).length>i.length))return a(e,i,r,o)}return""}}(t)(e,t,n,r):a(e,t,n,r)}function o(e){try{return JSON.parse(e)}catch(t){return[e]}}function a(e,t,n){for(var r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],o=0,a=0,i="",s="";o<t.length&&a<e.length;){var c=t[o],l=e[a],f=n[c];if(f&&f.pattern)f.pattern.test(l)&&(i+=u(l,f),o++),a++;else if(f&&f.repeat){var p=n[t[o-1]];p&&!p.pattern.test(l)?o++:o--}else f&&f.escape&&(c=t[++o]),r&&(i+=c),l===c&&a++,o++}for(;r&&o<t.length;){var v=t[o];if(n[v]){s="";break}s+=v,o++}return i+s}function u(e,t){return t.uppercase?e.toLocaleUpperCase():t.lowercase?e.toLocaleLowerCase():e}n.r(t);var i={"#":{pattern:/[0-9]/},X:{pattern:/[0-9a-zA-Z]/},S:{pattern:/[a-zA-Z]/},A:{pattern:/[a-zA-Z]/,uppercase:!0},a:{pattern:/[a-zA-Z]/,lowercase:!0},"!":{escape:!0},"*":{repeat:!0}};function s(e){return e instanceof HTMLInputElement?e:e.querySelector("input")||e}function c(e){return"[object String]"===Object.prototype.toString.call(e)}function l(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function f(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?l(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function v(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var d=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),!t)throw new Error("Maska: no element for mask");if(n.tokens)for(var r in n.tokens)n.tokens[r]=f({},n.tokens[r]),n.tokens[r].pattern&&c(n.tokens[r].pattern)&&(n.tokens[r].pattern=new RegExp(n.tokens[r].pattern));this._opts={mask:n.mask,tokens:f({},i,{},n.tokens)},this._el=c(t)?document.querySelectorAll(t):t.length?t:[t],this.init()}var t,n,o;return t=e,(n=[{key:"init",value:function(){for(var e=this,t=0;t<this._el.length;t++){var n=s(this._el[t]);(!n.dataset.mask&&this._opts.mask||n.dataset.mask!==this._opts.mask)&&(n.dataset.mask=this._opts.mask),this.updateValue(n),n.addEventListener("input",(function(t){return e.updateValue(t.target)}))}}},{key:"destroy",value:function(){for(var e=this,t=0;t<this._el.length;t++){var n=s(this._el[t]);n.removeEventListener("input",(function(t){return e.updateValue(t.target)})),delete n.dataset.mask}}},{key:"updateValue",value:function(e){if(e.value&&e.dataset.mask){var t,n,o=e.selectionEnd,a=e.value,u=a[o-1];e.value=r(e.value,e.dataset.mask,this._opts.tokens),function(e,t,n){for(;t<e.value.length&&e.value.charAt(t-1)!==n;)t++;e===document.activeElement&&(e.setSelectionRange(t,t),setTimeout((function(){e.setSelectionRange(t,t)}),0))}(e,o,u),e.value!==a&&e.dispatchEvent((t="input",(n=document.createEvent("Event")).initEvent(t,!0,!0),n))}}}])&&v(t.prototype,n),o&&v(t,o),e}();function y(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function b(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function g(e){var t={};return e.mask?(t.mask=Array.isArray(e.mask)?JSON.stringify(e.mask):e.mask,t.tokens=e.tokens?function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?y(Object(n),!0).forEach((function(t){b(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):y(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({},e.tokens):{}):t.mask=Array.isArray(e)?JSON.stringify(e):e,t}function m(e,t){if(t.value)return t.value&&function(e){return!(c(e.value)&&e.value===e.oldValue||Array.isArray(e.value)&&JSON.stringify(e.value)===JSON.stringify(e.oldValue)||e.value&&e.value.mask&&e.oldValue&&e.oldValue.mask&&e.value.mask===e.oldValue.mask)}(t)?new d(e,g(t.value)):void 0}function k(e){e.directive("maska",m)}function O(e,t){return new d(e,t)}n.d(t,"create",(function(){return O})),n.d(t,"mask",(function(){return r})),n.d(t,"maska",(function(){return m})),n.d(t,"tokens",(function(){return i})),"undefined"!=typeof window&&window.Vue&&window.Vue.use(k);t.default=k}])}));
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("Maska",[],t):"object"==typeof exports?exports.Maska=t():e.Maska=t()}(window,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";function r(e,t,n){var r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3];return o(t).length>1?function(e){var t=o(e).sort((function(e,t){return e.length-t.length}));return function(e,n,r){for(var o=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],u=0;u<t.length;){var i=t[u];u++;var s=t[u];if(!(s&&a(e,s,r,!0).length>i.length))return a(e,i,r,o)}return""}}(t)(e,t,n,r):a(e,t,n,r)}function o(e){try{return JSON.parse(e)}catch(t){return[e]}}function a(e,t,n){for(var r=!(arguments.length>3&&void 0!==arguments[3])||arguments[3],o=0,a=0,i="",s="";o<t.length&&a<e.length;){var c=t[o],l=e[a],f=n[c];if(f&&f.pattern)f.pattern.test(l)&&(i+=u(l,f),o++),a++;else if(f&&f.repeat){var p=n[t[o-1]];p&&!p.pattern.test(l)?o++:o--}else f&&f.escape&&(c=t[++o]),r&&(i+=c),l===c&&a++,o++}for(;r&&o<t.length;){var v=t[o];if(n[v]){s="";break}s+=v,o++}return i+s}function u(e,t){return t.uppercase?e.toLocaleUpperCase():t.lowercase?e.toLocaleLowerCase():e}n.r(t);var i={"#":{pattern:/[0-9]/},X:{pattern:/[0-9a-zA-Z]/},S:{pattern:/[a-zA-Z]/},A:{pattern:/[a-zA-Z]/,uppercase:!0},a:{pattern:/[a-zA-Z]/,lowercase:!0},"!":{escape:!0},"*":{repeat:!0}};function s(e){return e instanceof HTMLInputElement?e:e.querySelector("input")||e}function c(e){return"[object String]"===Object.prototype.toString.call(e)}function l(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function f(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?l(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function v(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var d=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),!t)throw new Error("Maska: no element for mask");if(n.tokens)for(var r in n.tokens)n.tokens[r]=f({},n.tokens[r]),n.tokens[r].pattern&&c(n.tokens[r].pattern)&&(n.tokens[r].pattern=new RegExp(n.tokens[r].pattern));this._opts={mask:n.mask,tokens:f({},i,{},n.tokens)},this._el=c(t)?document.querySelectorAll(t):t.length?t:[t],this.init()}var t,n,o;return t=e,(n=[{key:"init",value:function(){for(var e=this,t=0;t<this._el.length;t++){var n=s(this._el[t]);!this._opts.mask||n.dataset.mask&&n.dataset.mask===this._opts.mask||(n.dataset.mask=this._opts.mask),this.updateValue(n),n.addEventListener("input",(function(t){return e.updateValue(t.target)}))}}},{key:"destroy",value:function(){for(var e=this,t=0;t<this._el.length;t++){var n=s(this._el[t]);n.removeEventListener("input",(function(t){return e.updateValue(t.target)})),delete n.dataset.mask}}},{key:"updateValue",value:function(e){if(e.value&&e.dataset.mask){var t,n,o=e.selectionEnd,a=e.value,u=a[o-1];e.value=r(e.value,e.dataset.mask,this._opts.tokens),function(e,t,n){for(;t<e.value.length&&e.value.charAt(t-1)!==n;)t++;e===document.activeElement&&(e.setSelectionRange(t,t),setTimeout((function(){e.setSelectionRange(t,t)}),0))}(e,o,u),e.value!==a&&e.dispatchEvent((t="input",(n=document.createEvent("Event")).initEvent(t,!0,!0),n))}}}])&&v(t.prototype,n),o&&v(t,o),e}();function y(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function b(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function g(e){var t={};return e.mask?(t.mask=Array.isArray(e.mask)?JSON.stringify(e.mask):e.mask,t.tokens=e.tokens?function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?y(Object(n),!0).forEach((function(t){b(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):y(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({},e.tokens):{}):t.mask=Array.isArray(e)?JSON.stringify(e):e,t}function m(e,t){if(t.value)return t.value&&function(e){return!(c(e.value)&&e.value===e.oldValue||Array.isArray(e.value)&&JSON.stringify(e.value)===JSON.stringify(e.oldValue)||e.value&&e.value.mask&&e.oldValue&&e.oldValue.mask&&e.value.mask===e.oldValue.mask)}(t)?new d(e,g(t.value)):void 0}function k(e){e.directive("maska",m)}function O(e,t){return new d(e,t)}n.d(t,"create",(function(){return O})),n.d(t,"mask",(function(){return r})),n.d(t,"maska",(function(){return m})),n.d(t,"tokens",(function(){return i})),"undefined"!=typeof window&&window.Vue&&window.Vue.use(k);t.default=k}])}));
\ No newline at end of file
diff --git a/src/maska.js b/src/maska.js
index 8d86358..dd0df12 100644
--- a/src/maska.js
+++ b/src/maska.js
@@ -27,7 +27,7 @@ export default class Maska {
   init () {
     for (let i = 0; i < this._el.length; i++) {
       const el = findInputElement(this._el[i])
-      if ((!el.dataset.mask && this._opts.mask) || el.dataset.mask !== this._opts.mask) {
+      if (this._opts.mask && (!el.dataset.mask || el.dataset.mask !== this._opts.mask)) {
         el.dataset.mask = this._opts.mask
       }
       this.updateValue(el)