fixNsv

assets/toolkit/toolkit.js

@@ -3,6 +3,7 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
     var $ = require('jquery');
 
 
+
     var __Config = function () {
 
         function Config() {
@@ -227,7 +228,6 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
                 key;
             if (Object.keys(messageObject).length) {
 
-                console.log('1');
                 for (key in messageObject) {
                     msg = messageObject[key];
                     console.log(msg);
@@ -270,7 +270,7 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
         }
 
         document.addEventListener('click', clickHandler, false);
-        document.addEventListener('change', chahgeHandler, false);
+        document.addEventListener('change', changeHandler, false);
         document.addEventListener('keydown', escapeKeyHandler, false);
         window.addEventListener('resize', resizeHandler, false);
 
@@ -346,9 +346,10 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
         }
 
         // изменение инпута
-        function chahgeHandler(e) {
+        function changeHandler(e) {
             var select = e.target;
             changeSelect(select);
+            console.log('changeHandler');
         }
 
         /**
@@ -702,6 +703,7 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
 
             this.init();
 
+            console.log('Inputs constructor');
 
             window.addEventListener('resize', function () {
                 return _this.refresh();
@@ -716,6 +718,7 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
                 return _this.refresh();
             }, false);
             document.addEventListener('input', function (e) {
+                console.log('input');
                 return _this.changeFiled(e);
             }, false);
             document.addEventListener('paste', function (e) {
@@ -728,17 +731,34 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
                 return _this.changeFiled(e);
             }, false);
             document.addEventListener('change', function (e) {
+                console.log('change');
                 return _this.switchField(e);
             }, false);
 
         }
 
         Inputs.prototype.checkDirty = function checkDirty(element) {
-            return !element.value && !element.placeholder.length ? element.setAttribute('data-dirty', 'false') : element.setAttribute('data-dirty', 'true');
+            var bDirty = false;
+
+            if(element.placeholder.length) {
+                element.setAttribute('data-dirty', 'true');
+                return true;
+            }
+
+            if(element.mask) {
+                var raw = element.mask.getRaw();
+                bDirty = !!raw.length;
+            } else {
+                bDirty = !!element.value;
+            }
+
+            element.setAttribute('data-dirty', bDirty?'true':'false');
+            return bDirty;
         };
 
 
         Inputs.prototype.changeFiled = function changeFiled(e) {
+            console.log('changeFiled');
             var _this2 = this;
             var target = e.target || e;
             if (target.classList.contains('kit-field__input')) {
@@ -818,7 +838,7 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
             }
         };
 
-        Inputs.prototype.setMask = function setMask() {
+        Inputs.prototype.setTelMask = function () {
             var _this3 = this;
 
             $('[type=tel]').mask(Config.mask.tel, {
@@ -826,21 +846,42 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
                     _this3.fieldNormalize(this);
                 }
             }).on('blur.mask', function (e) {
-                _this3.checkDirty(e.currentTarget);
+                //_this3.checkDirty(e.currentTarget);
             });
         };
 
-        Inputs.prototype.unsetMask = function unsetMask() {
+        Inputs.prototype.setMask = function () {
+            var _this3 = this;
+
+            var node = $('[data-mask]');
+
+            node.each(function(index, item){
+                item = $(item);
+                var placeholder = item.attr('data-mask-placeholder');
+                placeholder = placeholder?placeholder:'_';
+                item.mask(item.attr('data-mask'), {
+                    placeholder: placeholder,
+                    completed: function completed() {
+                        _this3.fieldNormalize(this);
+                    }
+                }).on('blur.mask', function (e) {
+                    //_this3.checkDirty(e.currentTarget);
+                });
+            });
+        };
+
+        Inputs.prototype.unsetTelMask = function() {
             $('input[type=tel]').unmask();
         };
 
         Inputs.prototype.init = function init() {
             this.checkAllInputs();
             this.setMask();
+            this.setTelMask();
         };
 
         Inputs.prototype.refresh = function refresh() {
-            this.unsetMask();
+            this.unsetTelMask();
             this.init();
         };
 
@@ -893,11 +934,21 @@ kit.PluginManager.register('toolkit',function(module, exports, require) {
     var Inputs = new __Inputs();
 
 
-    module.exports.Helper = Helper;
-    module.exports.Select = Select();
-    module.exports.Config = Config;
-    module.exports.Message = Message;
-    module.exports.Inputs = Inputs;
+    /**
+     * @class kit.toolkit
+     */
+    var toolkit = {
+        Helper: Helper,
+        Select: Select(),
+        Config: Config,
+        Message: Message,
+        Inputs: Inputs,
+    };
+
+
+    Object.assign(module.exports, toolkit);
+
+
 
     return module.exports;
 });