diff --git a/assets/support/support.js b/assets/support/support.js index 164d483..f8d6a83 100644 --- a/assets/support/support.js +++ b/assets/support/support.js @@ -498,6 +498,8 @@ __PluginManager__.register('support', function(module, exports, require, global) isFloat, isString, isNode, + isNodeList, + isDomObject, isElement, getNode, extend, diff --git a/assets/toolkit/toolkit.js b/assets/toolkit/toolkit.js index 9751624..c44acbd 100644 --- a/assets/toolkit/toolkit.js +++ b/assets/toolkit/toolkit.js @@ -1,6 +1,7 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) { var $ = require('jQuery'); + var support = require('support'); var __Helper = function () { @@ -729,7 +730,7 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) } - Inputs.prototype.checkDirty = function checkDirty(element) { + Inputs.prototype.setDirty = function setDirty(element) { var bDirty = false; if(element.placeholder.length) { @@ -748,13 +749,12 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) return bDirty; }; - Inputs.prototype.changeFiled = function changeFiled(e) { var _this2 = this; var target = e.target || e; if (target.classList.contains('kit-field__input')) { - if (target.tagName == 'INPUT' || target.tagName == 'TEXTAREA') { - this.checkDirty(target); + if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') { + this.setDirty(target); var value_min = $(target).attr('value_min'); var value_max = $(target).attr('value_max'); @@ -785,11 +785,9 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) if (item.tagName === 'TEXTAREA') { if (item.classList.contains('kit-autoheight')) { _this2.calcAutoHeight(item); - _this2.checkDirty(item); } - } else { - _this2.checkDirty(item); } + _this2.setDirty(item); }); }; @@ -832,10 +830,17 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) } }; - Inputs.prototype.setTelMask = function () { + Inputs.prototype.setTelMask = function (node = false) { var _this3 = this; - $('[type=tel]').mask(global.config.defaultPhoneMask, { + if(support.isElement(node) || support.isNodeList(node)){ + node = $(node); + } else if(node === false){ + node = $('[type=tel]'); + } else { + return; + } + node.mask(global.config.defaultPhoneMask, { placeholder: '_', completed: function completed() { _this3.fieldNormalize(this); } @@ -844,10 +849,16 @@ kit.PluginManager.register('toolkit', function(module, exports, require, global) }); }; - Inputs.prototype.setMask = function () { + Inputs.prototype.setMask = function (node = false) { var _this3 = this; - var node = $('[data-mask]'); + if(support.isElement(node) || support.isNodeList(node)){ + node = $(node); + } else if(node === false){ + node = $('[data-mask]'); + } else { + return; + } node.each(function(index, item){ item = $(item);