Version 4.8.6

Author: Ronef

CHANGELOG.md

@@ -1,6 +1,11 @@
 # (MODX)EvolutionCMS.plugins.ManagerManager.mm_ddMultipleFields changelog
 
 
+## Version 4.8.6 (2021-10-04)
+* \* Improved working with deprecated `id` columns.
+* \* Improved working with invalid JSON field values.
+
+
 ## Version 4.8.5 (2021-10-03)
 * \* (MODX)EvolutionsCMS.libraries.ddTools is including from `assets/libs/ddTools/`, because ManagerManager does not contain the library files anymore.
 

CHANGELOG_ru.md

@@ -1,6 +1,11 @@
 # (MODX)EvolutionCMS.plugins.ManagerManager.mm_ddMultipleFields changelog
 
 
+## Версия 4.8.6 (2021-10-04)
+* \* Улучшена работа с устаревшими колонками типа `id`.
+* \* Улучшена работа с невалидным JSON в значении полей.
+
+
 ## Версия 4.8.5 (2021-10-03)
 * \* (MODX)EvolutionsCMS.libraries.ddTools подключается из `assets/libs/ddTools/`, потому что ManagerManager больше не содержит файлов библиотеки.
 

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "dd/evolutioncms-plugins-managermanager-mm_ddmultiplefields",
-	"version": "4.8.5",
+	"version": "4.8.6",
 	"description": "Widget for plugin ManagerManager that allows you to add any number of fields values (TV) in one document (values are written in field as a JSON object). For example: a few images.",
 	"keywords": [
 		"modx",

ddmultiplefields.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * (MODX)EvolutionCMS.plugins.ManagerManager.mm_ddMultipleFields
- * @version 4.8.5 (2021-10-03)
+ * @version 4.8.6 (2021-10-04)
  * 
  * @link https://code.divandesign.biz/modx/mm_ddmultiplefields
  * 
@@ -103,7 +103,7 @@ function mm_ddMultipleFields($params){
 			),
 			'html',
 			'jQuery.ddMM.mm_ddMultipleFields',
-			'2.5.7'
+			'2.5.9'
 		);
 
 		$e->output($output);

jQuery.ddMM.mm_ddMultipleFields.js

@@ -1,12 +1,12 @@
 /**
  * jQuery.ddMM.mm_ddMultipleFields
- * @version 2.5.7 (2021-01-15)
+ * @version 2.5.9 (2021-10-04)
  * 
  * @uses jQuery 1.9.1
  * @uses jQuery.ddTools 1.8.1
  * @uses jQuery.ddMM 1.1.2
  * 
- * @copyright 2013–2020 [DD Group]{@link https://DivanDesign.biz }
+ * @copyright 2013–2021 [DD Group]{@link https://DivanDesign.biz }
  */
 
 (function($){
@@ -189,7 +189,7 @@ $.ddMM.mm_ddMultipleFields = {
 
 	/**
 	 * @method init
-	 * @version 4.3.4 (2021-01-15)
+	 * @version 4.3.5 (2021-10-04)
 	 * 
 	 * @desc Инициализация.
 	 * 
@@ -236,9 +236,6 @@ $.ddMM.mm_ddMultipleFields = {
 				if (columnObject.type == 'id'){
 					columnIdIndex = columnIndex;
 
-					//Remove deprecated column
-					delete instance.columns[columnIndex];
-					
 					//Continue
 					return true;
 				}
@@ -257,7 +254,11 @@ $.ddMM.mm_ddMultipleFields = {
 
 				//Prepare width
 				if (!columnObject.width){
-					if (columnIndex > 0){
+					if (
+						//Preverious column exist
+						$.isPlainObject(instance.columns[columnIndex - 1]) &&
+						instance.columns[columnIndex - 1].width
+					){
 						//Take from preverious column
 						instance.columns[columnIndex].width = instance.columns[columnIndex - 1].width;
 					}else{
@@ -273,6 +274,15 @@ $.ddMM.mm_ddMultipleFields = {
 			}
 		);
 
+		//If deprecated ID column exists
+		if (columnIdIndex != -1){
+			//Remove it
+			instance.columns.splice(
+				columnIdIndex,
+				1
+			);
+		}
+		
 		var
 			//Объект значения поля
 			fieldValueObject = _this.init_prepareFieldValueObject({
@@ -359,7 +369,7 @@ $.ddMM.mm_ddMultipleFields = {
 
 	/**
 	 * @method init_prepareFieldValueObject
-	 * @version 1.0.2 (2020-05-25)
+	 * @version 1.1 (2021-10-04)
 	 * 
 	 * @desc Инициализация → Подготовка объекта значений поля.
 	 * 
@@ -390,7 +400,11 @@ $.ddMM.mm_ddMultipleFields = {
 			) ==
 			'{'
 		){
-			fieldValueObject = $.parseJSON(params.value);
+			try {
+				fieldValueObject = $.parseJSON(params.value);
+			}catch{
+				fieldValueObject = {};
+			}
 		//Bacward compatibility
 		}else{
 			var
@@ -411,8 +425,12 @@ $.ddMM.mm_ddMultipleFields = {
 						rowId = _this.generateRowId()
 					;
 
-					//If deprecated ID column exists
-					if (params.columnIdIndex != -1){
+					if (
+						//If deprecated ID column exists
+						params.columnIdIndex != -1 &&
+						//And not empty
+						columnValuesArray[params.columnIdIndex] != ''
+					){
 						rowId = columnValuesArray[params.columnIdIndex];
 					}