vgapp 1.2.0 → 1.2.1

package/app/modules/vgformsender/js/vgformsender.js

@@ -1,4 +1,4 @@
-/**
+/**
  * VGFormSender Module
  *
  * Этот модуль отвечает за отправку форм с поддержкой AJAX, валидации, отображения уведомлений
@@ -130,13 +130,14 @@ class VGFormSender extends BaseModule {
 				classes: ['vg-form-sender--hide-show-pass'],
 				insert: 'afterend'
 			},
-			alert: {
-				enabled: true,
-				type: 'modal',
-				errors: true,
-				delay: 0,
-				toast: {}
-			},
+			alert: {
+				enabled: true,
+				type: 'modal',
+				errors: true,
+				title: true,
+				delay: 0,
+				toast: {}
+			},
 			ajax: {
 				route: '',
 				target: '',
@@ -634,6 +635,7 @@ class VGFormSender extends BaseModule {
 	 */
 	_getToastParams(status) {
 		const theme = status === 'error' ? 'danger' : status;
+		const toastType = status === 'danger' ? 'error' : status;
 		const delay = this._params.alert.delay > 0 ? this._params.alert.delay : 3000;
 		const flatToastParams = {};
 		const allowedKeys = [
@@ -645,7 +647,6 @@ class VGFormSender extends BaseModule {
 			'enableButtonClose',
 			'keyboard',
 			'theme',
-			'type',
 			'drag',
 			'resize',
 			'stack',
@@ -661,6 +662,7 @@ class VGFormSender extends BaseModule {
 
 		return mergeDeepObject({
 			theme: theme || 'dark',
+			type: toastType || null,
 			enableButtonClose: true,
 			autohide: this._params.alert.delay > 0,
 			delay: delay
@@ -771,10 +773,10 @@ class VGFormSender extends BaseModule {
 					}, response.message);
 				}
 
-				return {
-					title: response.title || '',
-					message: message
-				};
+				return {
+					title: this._params.alert.title ? response.title || '' : '',
+					message: message
+				};
 			}
 		}
 
@@ -873,3 +875,4 @@ EventHandler.on(document, EVENT_SUBMIT_DATA_API, function (event) {
 })
 
 export default VGFormSender;
+

package/app/modules/vgtoast/js/vgtoast.js

@@ -289,13 +289,14 @@ class VGToast extends BaseModule {
 
 		wrapper.append(content);
 
-		// Кнопка закрытия
-		if (params.enableButtonClose) {
-			const button = document.createElement('div');
-			button.classList.add('vg-toast-button');
-			button.innerHTML = '<button class="vg-btn-close" data-vg-dismiss="toast"></button>';
-			wrapper.append(button);
-		}
+		// Кнопка закрытия
+		if (params.enableButtonClose) {
+			target.classList.add('vg-toast-has-button');
+			const button = document.createElement('div');
+			button.classList.add('vg-toast-button');
+			button.innerHTML = '<button class="vg-btn-close" data-vg-dismiss="toast"></button>';
+			wrapper.append(button);
+		}
 
 		target.append(wrapper);
 		document.body.append(target);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vgapp",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "",
 	"author": {
 		"name": "Vegas Studio",