merge uim js
This commit is contained in:
@ -7,15 +7,9 @@ var KTSigninGeneral = function () {
|
|||||||
fields: {
|
fields: {
|
||||||
email: {
|
email: {
|
||||||
validators: {
|
validators: {
|
||||||
<<<<<<< HEAD
|
|
||||||
notEmpty: { message: "User ID is required" }
|
notEmpty: { message: "User ID is required" }
|
||||||
}
|
}
|
||||||
}, password: { validators: { notEmpty: { message: "The password is required" } } }
|
}, password: { validators: { notEmpty: { message: "The password is required" } } }
|
||||||
=======
|
|
||||||
notEmpty: {message: "User ID is required"}
|
|
||||||
}
|
|
||||||
}, password: {validators: {notEmpty: {message: "The password is required"}}}
|
|
||||||
>>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
|
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
trigger: new FormValidation.plugins.Trigger,
|
trigger: new FormValidation.plugins.Trigger,
|
||||||
@ -37,11 +31,7 @@ var KTSigninGeneral = function () {
|
|||||||
icon: "error",
|
icon: "error",
|
||||||
buttonsStyling: !1,
|
buttonsStyling: !1,
|
||||||
confirmButtonText: "Ok, got it!",
|
confirmButtonText: "Ok, got it!",
|
||||||
<<<<<<< HEAD
|
|
||||||
customClass: { confirmButton: "btn btn-primary" }
|
customClass: { confirmButton: "btn btn-primary" }
|
||||||
=======
|
|
||||||
customClass: {confirmButton: "btn btn-primary"}
|
|
||||||
>>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
|
|
||||||
})
|
})
|
||||||
})).catch((function (t) {
|
})).catch((function (t) {
|
||||||
Swal.fire({
|
Swal.fire({
|
||||||
@ -49,11 +39,7 @@ var KTSigninGeneral = function () {
|
|||||||
icon: "error",
|
icon: "error",
|
||||||
buttonsStyling: !1,
|
buttonsStyling: !1,
|
||||||
confirmButtonText: "Ok, got it!",
|
confirmButtonText: "Ok, got it!",
|
||||||
<<<<<<< HEAD
|
|
||||||
customClass: { confirmButton: "btn btn-primary" }
|
customClass: { confirmButton: "btn btn-primary" }
|
||||||
=======
|
|
||||||
customClass: {confirmButton: "btn btn-primary"}
|
|
||||||
>>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
|
|
||||||
})
|
})
|
||||||
})).then((() => {
|
})).then((() => {
|
||||||
e.removeAttribute("data-kt-indicator"), e.disabled = !1
|
e.removeAttribute("data-kt-indicator"), e.disabled = !1
|
||||||
@ -62,11 +48,7 @@ var KTSigninGeneral = function () {
|
|||||||
icon: "error",
|
icon: "error",
|
||||||
buttonsStyling: !1,
|
buttonsStyling: !1,
|
||||||
confirmButtonText: "Ok, got it!",
|
confirmButtonText: "Ok, got it!",
|
||||||
<<<<<<< HEAD
|
|
||||||
customClass: { confirmButton: "btn btn-primary" }
|
customClass: { confirmButton: "btn btn-primary" }
|
||||||
=======
|
|
||||||
customClass: {confirmButton: "btn btn-primary"}
|
|
||||||
>>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
|
|
||||||
})
|
})
|
||||||
}))
|
}))
|
||||||
}))
|
}))
|
||||||
|
Reference in New Issue
Block a user