mirror of
https://bitbucket.org/bellord13/kit.git
synced 2026-11-13 19:06:11 +03:00
fix
This commit is contained in:
+35
-21
@@ -8,7 +8,8 @@
|
||||
flex-wrap: nowrap;
|
||||
margin: 10px 0;
|
||||
position: relative;
|
||||
pointer-events: none;
|
||||
/* intl-tel-input */
|
||||
/*pointer-events: none;*/
|
||||
line-height: 1.5em;
|
||||
--kit-field-focus-label-zoom-ratio: 1;
|
||||
--kit-field-line-padding: 0.1875em;
|
||||
@@ -17,6 +18,10 @@
|
||||
font-family: var(--kit-font-family);
|
||||
}
|
||||
|
||||
.kit-field .iti {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.kit-field__input {
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
@@ -127,7 +132,7 @@
|
||||
padding-left: 10px;
|
||||
}
|
||||
.kit-field.kit-field--bordered .kit-field__input:focus ~.kit-field__hr,
|
||||
.kit-field.kit-field--bordered .kit-field__input.focus ~.kit-field__hr
|
||||
.kit-field.kit-field--bordered.focus .kit-field__hr
|
||||
{
|
||||
border-color: var(--kit-color-primary);
|
||||
}
|
||||
@@ -166,7 +171,7 @@
|
||||
overflow: hidden;
|
||||
}
|
||||
.kit-field textarea,
|
||||
.kit-field input,
|
||||
.kit-field input.kit-field__input,
|
||||
.kit-field.autoComplete_wrapper > input,
|
||||
.kit-field .kit-field__display {
|
||||
pointer-events: auto;
|
||||
@@ -175,7 +180,6 @@
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
color: transparent;
|
||||
font-weight: normal;
|
||||
line-height: 1.5em;
|
||||
min-height: calc(1.5em + 6px);
|
||||
height: 100%;
|
||||
@@ -249,15 +253,15 @@
|
||||
|
||||
.kit-field textarea:focus,
|
||||
.kit-field input:focus,
|
||||
.kit-field textarea.focus,
|
||||
.kit-field input.focus {
|
||||
.kit-field.focus textarea,
|
||||
.kit-field.focus input {
|
||||
color: var(--kit-color-text);
|
||||
border-color: transparent;
|
||||
}
|
||||
.kit-field textarea:focus ~.kit-field__label,
|
||||
.kit-field input:focus ~.kit-field__label,
|
||||
.kit-field textarea.focus ~.kit-field__label,
|
||||
.kit-field input.focus ~.kit-field__label {
|
||||
.kit-field.focus .kit-field__label,
|
||||
.kit-field.focus .kit-field__label {
|
||||
top: 0;
|
||||
transform: translate(0, 0);
|
||||
font-size: calc(1em * var(--kit-field-focus-label-zoom-ratio, 1));
|
||||
@@ -265,8 +269,8 @@
|
||||
}
|
||||
.kit-field textarea:focus ~.kit-field__hr:after,
|
||||
.kit-field input:focus ~.kit-field__hr:after,
|
||||
.kit-field textarea.focus ~.kit-field__hr:after,
|
||||
.kit-field input.focus ~.kit-field__hr:after {
|
||||
.kit-field.focus .kit-field__hr:after,
|
||||
.kit-field.focus .kit-field__hr:after {
|
||||
left: 0;
|
||||
width: 100%;
|
||||
}
|
||||
@@ -321,6 +325,9 @@
|
||||
.kit-field .kit-field__display:disabled ~.kit-field__hr {
|
||||
border-color: #e1e1e1 !important;
|
||||
}
|
||||
.kit-field.hidden {
|
||||
display: none !important;
|
||||
}
|
||||
.kit-field .kit-field__error,
|
||||
.kit-field .kit-field__message {
|
||||
text-align: left;
|
||||
@@ -347,29 +354,35 @@
|
||||
{
|
||||
color: var(--kit-color);
|
||||
}
|
||||
.kit-field .kit-field--error ~.kit-field__message
|
||||
.kit-field .kit-field--error ~.kit-field__message,
|
||||
.kit-field.kit-field--error .kit-field__message
|
||||
{
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
color: var(--kit-color-error);
|
||||
}
|
||||
.kit-field .kit-field--error ~.kit-field__label {
|
||||
.kit-field .kit-field--error ~.kit-field__label,
|
||||
.kit-field.kit-field--error .kit-field__label {
|
||||
color: var(--kit-color-error) !important;
|
||||
}
|
||||
.kit-field .kit-field--error ~.kit-field__hr:after {
|
||||
.kit-field .kit-field--error ~.kit-field__hr:after,
|
||||
.kit-field.kit-field--error .kit-field__hr:after {
|
||||
border-color: var(--kit-color-error) !important;
|
||||
}
|
||||
|
||||
.kit-field .kit-field--warning ~.kit-field__message
|
||||
.kit-field .kit-field--warning ~.kit-field__message,
|
||||
.kit-field.kit-field--warning .kit-field__message
|
||||
{
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
color: var(--kit-color-warning);
|
||||
}
|
||||
.kit-field .kit-field--warning ~.kit-field__label {
|
||||
.kit-field .kit-field--warning ~.kit-field__label,
|
||||
.kit-field.kit-field--warning .kit-field__label {
|
||||
color: var(--kit-color-warning) !important;
|
||||
}
|
||||
.kit-field .kit-field--warning ~.kit-field__hr:after {
|
||||
.kit-field .kit-field--warning ~.kit-field__hr:after,
|
||||
.kit-field.kit-field--warning .kit-field__hr:after {
|
||||
border-color: var(--kit-color-warning) !important;
|
||||
}
|
||||
.kit-field__text {
|
||||
@@ -924,7 +937,8 @@
|
||||
}
|
||||
.kit-button.kit-button--material:hover:before,
|
||||
.kit-button.kit-button--material:active:before,
|
||||
.kit-button.kit-button--material:focus:before {
|
||||
.kit-button.kit-button--material:focus:before,
|
||||
.kit-button.kit-button--material.focus:before {
|
||||
box-shadow: inset 0 -2px 0 var(--kit-color-button-material, var(--kit-color-text));
|
||||
}
|
||||
.kit-button.kit-button--material .kit-button__border {
|
||||
@@ -1265,14 +1279,14 @@ select.kit-field__input:disabled ~.kit-field__hr {
|
||||
|
||||
.kit-field textarea[readonly]:focus,
|
||||
.kit-field input[readonly]:focus,
|
||||
.kit-field textarea[readonly].focus,
|
||||
.kit-field input[readonly].focus {
|
||||
.kit-field.focus textarea[readonly],
|
||||
.kit-field.focus input[readonly] {
|
||||
color: var(--kit-color-readonly);
|
||||
}
|
||||
.kit-field textarea[readonly]:focus ~.kit-field__label,
|
||||
.kit-field input[readonly]:focus ~.kit-field__label,
|
||||
.kit-field textarea[readonly].focus ~.kit-field__label,
|
||||
.kit-field input[readonly].focus ~.kit-field__label
|
||||
.kit-field.focus textarea[readonly] ~.kit-field__label,
|
||||
.kit-field.focus input[readonly] ~.kit-field__label
|
||||
{
|
||||
color: var(--kit-color-readonly);
|
||||
}
|
||||
|
||||
+40
-41
@@ -424,7 +424,7 @@ __PluginManager__.register('toolkit', function(require, exports, module, global)
|
||||
|
||||
select.setAttribute('data-dirty', bDirty?'true':'false');
|
||||
|
||||
removeClass(select, 'kit-field--error');
|
||||
inputs.fieldNormalize(select);
|
||||
|
||||
// for(let key in attrs){
|
||||
// if( attrs[key].nodeName !== 'value' && attrs[key].nodeName !== undefined){
|
||||
@@ -780,23 +780,19 @@ __PluginManager__.register('toolkit', function(require, exports, module, global)
|
||||
var isInput = target.tagName === 'INPUT', isTextarea = target.tagName === 'TEXTAREA';
|
||||
if (target.classList.contains('kit-field__input')) {
|
||||
if (isInput || isTextarea) {
|
||||
this.setDirty(target);
|
||||
_this2.setDirty(target);
|
||||
|
||||
var value_min = $(target).attr('value_min');
|
||||
var value_max = $(target).attr('value_max');
|
||||
if ((value_min !== "") && (Number(value_min) > Number(target.value))) {
|
||||
this.showFieldError(target, 'Минимальное значение ' + value_min);
|
||||
_this2.showFieldError(target, 'Минимальное значение ' + value_min);
|
||||
} else if ((value_max !== "") && (Number(value_max) < Number(target.value))) {
|
||||
this.showFieldError(target, 'Максимальное значение ' + value_max);
|
||||
_this2.showFieldError(target, 'Максимальное значение ' + value_max);
|
||||
} else {
|
||||
this.fieldNormalize(target);
|
||||
}
|
||||
|
||||
if (!$(target).hasClass('kit-field--error')) {
|
||||
$(target).siblings('.kit-field__message').text('');
|
||||
_this2.fieldNormalize(target);
|
||||
}
|
||||
if (target.classList.contains('kit-autoheight')) {
|
||||
this.calcAutoHeight(target);
|
||||
_this2.calcAutoHeight(target);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -842,11 +838,11 @@ __PluginManager__.register('toolkit', function(require, exports, module, global)
|
||||
return;
|
||||
}
|
||||
if (input.type.toLowerCase() === 'checkbox') {
|
||||
input.classList.remove('kit-field--error');
|
||||
inputs.fieldNormalize(input);
|
||||
} else if (input.type.toLowerCase() === 'radio') {
|
||||
var name = input.parentNode.querySelector('.kit-field__input').name;
|
||||
var otherRadio = document.querySelectorAll('[name= ' + name + ']');
|
||||
input.classList.remove('kit-field--error');
|
||||
inputs.fieldNormalize(input);
|
||||
[].forEach.call(otherRadio, function (item) {
|
||||
item.classList.remove('kit-field--error');
|
||||
});
|
||||
@@ -926,46 +922,49 @@ __PluginManager__.register('toolkit', function(require, exports, module, global)
|
||||
};
|
||||
|
||||
|
||||
Inputs.prototype.fieldNormalize = function fieldNormalize(inputNode) {
|
||||
Inputs.prototype.fieldNormalize = function (inputNode) {
|
||||
|
||||
const field = inputNode.closest('.kit-field');
|
||||
if(field){
|
||||
field.classList.remove('kit-field--warning', 'kit-field--success', 'kit-field--error');
|
||||
const message = field.querySelector('.kit-field__message');
|
||||
if(message) {
|
||||
message.innerHTML = '';
|
||||
}
|
||||
}
|
||||
inputNode = $(inputNode);
|
||||
if (inputNode.length) {
|
||||
//var parentNode = inputNode.parent();
|
||||
inputNode.removeClass('kit-field--warning kit-field--success kit-field--error');
|
||||
inputNode.siblings('.kit-field__message').html('');
|
||||
}
|
||||
return inputNode;
|
||||
};
|
||||
Inputs.prototype.showFieldError = function showFieldError(inputNode, msg) {
|
||||
inputNode = this.fieldNormalize(inputNode);
|
||||
if (inputNode.length) {
|
||||
//var parentNode = inputNode.parent();
|
||||
inputNode.addClass('kit-field--error');
|
||||
inputNode.siblings('.kit-field__message').html(msg);
|
||||
Inputs.prototype.showFieldMessage = function (inputNode, msg, type) {
|
||||
if(inputNode && inputNode.hasOwnProperty('length')){
|
||||
inputNode = inputNode[0];
|
||||
}
|
||||
if(!inputNode){
|
||||
return;
|
||||
}
|
||||
this.fieldNormalize(inputNode);
|
||||
const field = inputNode.closest('.kit-field');
|
||||
if(field){
|
||||
field.classList.add('kit-field--' + type);
|
||||
const message = field.querySelector('.kit-field__message');
|
||||
if(message) {
|
||||
message.innerHTML = msg;
|
||||
}
|
||||
}
|
||||
inputNode.classList.add('kit-field--' . type);
|
||||
};
|
||||
Inputs.prototype.showFieldSuccess = function showFieldSuccess(inputNode, msg) {
|
||||
inputNode = this.fieldNormalize(inputNode);
|
||||
if (inputNode.length) {
|
||||
//var parentNode = inputNode.parent();
|
||||
inputNode.addClass('kit-field--success');
|
||||
inputNode.siblings('.kit-field__message').html(msg);
|
||||
}
|
||||
Inputs.prototype.showFieldError = function (inputNode, msg) {
|
||||
this.showFieldMessage(inputNode, msg, 'error')
|
||||
};
|
||||
Inputs.prototype.showFieldWarning = function showFieldWarning(inputNode, msg) {
|
||||
inputNode = this.fieldNormalize(inputNode);
|
||||
if (inputNode.length) {
|
||||
//var parentNode = inputNode.parent();
|
||||
inputNode.addClass('kit-field--warning');
|
||||
inputNode.siblings('.kit-field__message').html(msg);
|
||||
}
|
||||
Inputs.prototype.showFieldSuccess = function (inputNode, msg) {
|
||||
this.showFieldMessage(inputNode, msg, 'success')
|
||||
};
|
||||
Inputs.prototype.hideFieldError = function hideFieldError(inputNode) {
|
||||
inputNode = $(inputNode);
|
||||
if (inputNode.length) {
|
||||
var parentNode = inputNode.parent();
|
||||
inputNode.removeClass('kit-field--error');
|
||||
inputNode.siblings('.kit-field__message').html('');
|
||||
}
|
||||
Inputs.prototype.showFieldWarning = function (inputNode, msg) {
|
||||
this.showFieldMessage(inputNode, msg, 'warning')
|
||||
};
|
||||
|
||||
|
||||
|
||||
Vendored
+1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user