@alexsab-ru/scripts 0.4.0 → 0.4.2

package/lib/form.js

@@ -24,7 +24,7 @@ export function maskphone(e) {
 
 export const phoneChecker = (phone) => {
 	let form = phone.closest("form"),
-		btn = form.querySelector('input[type="submit"]');
+		btn = form.querySelector('[type="submit"]');
 	if (!phone.value.length) {
 		showErrorMes(form, ".phone", "Телефон является обязательным полем");
 		stateBtn(btn, "Отправить");
@@ -91,8 +91,17 @@ document.querySelectorAll("textarea").forEach(function (textarea) {
 // BUTTON
 // Состояние кнопки
 const stateBtn = (btn, value, disable = false) => {
-	btn.value = value;
-	btn.disabled = disable;
+	if (btn.tagName == 'INPUT') {
+		btn.value = value;
+		btn.disabled = disable;
+	} else {
+		btn.innerText = value;
+		if (disable) {
+			btn.setAttribute('disabled', true);
+		} else {
+			btn.removeAttribute('disabled');
+		}
+	}
 };
 
 const showErrorMes = (form, el, text) => {
@@ -111,11 +120,11 @@ const showMessageModal = (messageModal, icon, message) => {
 };
 
 
-export const connectForms = (url, callback) => {
+export const connectForms = (url, callback, callback_error) => {
 
 // Отправка всех форм
 document.querySelectorAll("form").forEach((form) => {
-	const btn = form.querySelector('input[type="submit"]');
+	const btn = form.querySelector('[type="submit"]');
 	form.onsubmit = async (event) => {
 		event.preventDefault();
 		stateBtn(btn, "Отправляем...", true);
@@ -128,7 +137,7 @@ document.querySelectorAll("form").forEach((form) => {
 			'<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52"><path fill="#279548" d="M26,0A26,26,0,1,0,52,26,26,26,0,0,0,26,0Zm9.6,17.5a1.94,1.94,0,0,1,2,2,2,2,0,1,1-2-2Zm-19.2,0a2,2,0,1,1-2,2A2,2,0,0,1,16.4,17.5ZM40.09,32.15a15.8,15.8,0,0,1-28.18,0,1,1,0,0,1,1.78-.9,13.81,13.81,0,0,0,24.62,0,1,1,0,1,1,1.78.9Z"></path></svg>';
 		const errorText =
 			'<b class="text-bold block text-2xl mb-4">Упс!</b> Что-то пошло не так. Перезагрузите страницу и попробуйте снова. ';
-		let successText = '<b class="text-bold block text-2xl mb-4">Спасибо!</b> В скором времени мы свяжемся с Вами!';
+		const successText = '<b class="text-bold block text-2xl mb-4">Спасибо!</b> В скором времени мы свяжемся с Вами!';
 		const messageModal = document.getElementById("message-modal");
 
 		if (!phoneChecker(phone)) {
@@ -163,6 +172,10 @@ document.querySelectorAll("form").forEach((form) => {
 			window.location.origin + window.location.pathname
 		);
 
+		if(window.re) {
+			formData.append("re", window.re);
+		}
+
 		window.location.search
 			.slice(1)
 			.split("&")
@@ -190,7 +203,7 @@ document.querySelectorAll("form").forEach((form) => {
 		})
 			.then((res) => res.json())
 			.then((data) => {
-				console.log(data);
+				// console.log(data);
 				stateBtn(btn, "Отправить");
 				if (data.answer == "required") {
 					reachGoal("form_required");
@@ -198,15 +211,22 @@ document.querySelectorAll("form").forEach((form) => {
 					return;
 				} else if (data.answer == "error") {
 					reachGoal("form_error");
-					showMessageModal(messageModal, errorIcon, errorText + "<br>" + data.error);
+
+					// Вызов callback_error при ошибке
+					if (callback_error && typeof callback_error === 'function') {
+						callback_error();
+					} else if (messageModal) {
+						showMessageModal(messageModal, errorIcon, errorText + "<br>" + data.error);
+					}
 					return;
 				} else {
 					reachGoal("form_success", formDataObj);
-					showMessageModal(messageModal, successIcon, successText);
 
-					// Вызов callback в конце функции
+					// Вызов callback при успехе
 					if (callback && typeof callback === 'function') {
 						callback();
+					} else if (messageModal) {
+						showMessageModal(messageModal, successIcon, successText);
 					}
 				}
 				form.reset();
@@ -214,7 +234,13 @@ document.querySelectorAll("form").forEach((form) => {
 			.catch((error) => {
 				reachGoal("form_error");
 				console.error("Ошибка отправки данных формы: " + error);
-				showMessageModal(messageModal, errorIcon, errorText + "<br>" + error);
+
+				// Вызов callback_error при ошибке
+				if (callback_error && typeof callback_error === 'function') {
+					callback_error();
+				} else if (messageModal) {
+					showMessageModal(messageModal, errorIcon, errorText + "<br>" + error);
+				}
 				stateBtn(btn, "Отправить");
 			});
 		return false;

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@alexsab-ru/scripts",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "common libs for websites",
   "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/alexsab-ru/scripts.git"
@@ -22,8 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://github.com/alexsab-ru/scripts#readme",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  }
-}
+  "homepage": "https://github.com/alexsab-ru/scripts#readme"
+}