Merge branch 'dd_area_choosers_name_collapsing_group_more_than_1_instance_fix' into 'master'

DD area choosers: Fix for name collapsing w/ group names w/ more than 1 instance. Reported by nelgin

See merge request !547

xtrn/DDAreaChoosers/DDFileAreaChooser.js

@@ -83,6 +83,8 @@
  *                            showing help.
  * 2025-05-03 Eric Oulashin   Version 1.42d
  *                            Fix: Displays the configured area change header again
+ * 2025-05-27 Eric Oulashin   Version 1.42e
+ *                            Fix: Name collapsing for group names w/ more than 1 instance
  */
 
 // TODO: Failing silently when 1st argument is true
@@ -123,8 +125,8 @@ if (system.version_num < 31400)
 }
 
 // Version & date variables
-var DD_FILE_AREA_CHOOSER_VERSION = "1.42d";
-var DD_FILE_AREA_CHOOSER_VER_DATE = "2025-05-03";
+var DD_FILE_AREA_CHOOSER_VERSION = "1.42e";
+var DD_FILE_AREA_CHOOSER_VER_DATE = "2025-05-27";
 
 // Keyboard input key codes
 var CTRL_H = "\x08";
@@ -2056,6 +2058,16 @@ function getFileDirHeirarchy(pCollapsing, pCollapsingSeparator)
 				else
 					libsBeforeSeparator[libDescBeforeSep] = 1;
 			}
+			/*
+			// Temproary
+			if (user.is_sysop)
+			{
+				if (libDesc.indexOf("Mirrors") == 0)
+				{
+				}
+			}
+			// End Temporary
+			*/
 		}
 
 		// Build the heirarchy
@@ -2083,7 +2095,7 @@ function getFileDirHeirarchy(pCollapsing, pCollapsingSeparator)
 				// only appears once, then use the whole library name as one name
 				var sepCountInLibDesc = countSubstrInStr(libDesc, pCollapsingSeparator);
 				var startIdx = 0;
-				if (sepCountInLibDesc > 0 && libsBeforeSeparator.hasOwnProperty(nameArray[0]) == 1)
+				if (sepCountInLibDesc > 0 && libsBeforeSeparator.hasOwnProperty(nameArray[0]) && libsBeforeSeparator[nameArray[0]] == 1)
 					startIdx += sepCountInLibDesc;
 				for (var i = startIdx; i < nameArray.length; ++i)
 				{

xtrn/DDAreaChoosers/DDMsgAreaChooser.js

@@ -89,6 +89,8 @@
  * 2025-04-21 Eric Oulashin   Version 1.42c
  *                            F & L keys working again on the light bar menu (first & last page).
  *                            Fix for "this.DisplayMenuHdrWithNumItems is not a function".
+ * 2025-05-27 Eric Oulashin   Version 1.42e
+ *                            Fix: Name collapsing for group names w/ more than 1 instance
  */
 
 /* Command-line arguments:
@@ -126,8 +128,8 @@ if (system.version_num < 31400)
 }
 
 // Version & date variables
-var DD_MSG_AREA_CHOOSER_VERSION = "1.42c";
-var DD_MSG_AREA_CHOOSER_VER_DATE = "2025-04-21";
+var DD_MSG_AREA_CHOOSER_VERSION = "1.42e";
+var DD_MSG_AREA_CHOOSER_VER_DATE = "2025-05-27";
 
 // Keyboard input key codes
 var CTRL_H = "\x08";
@@ -3129,7 +3131,7 @@ function getMsgSubHeirarchy(pCollapsing, pCollapsingSeparator)
 				// only appears once, then use the whole group name as one name
 				var sepCountInGrpDesc = countSubstrInStr(grpDesc, pCollapsingSeparator);
 				var startIdx = 0;
-				if (sepCountInGrpDesc > 0 && grpsBeforeSeparator.hasOwnProperty(nameArray[0]) == 1)
+				if (sepCountInGrpDesc > 0 && grpsBeforeSeparator.hasOwnProperty(nameArray[0]) && grpsBeforeSeparator[nameArray[0]] == 1)
 					startIdx += sepCountInGrpDesc;
 				for (var i = startIdx; i < nameArray.length; ++i)
 				{

xtrn/DDAreaChoosers/readme.txt

                      Digital Distortion Area Choosers
-                              Version 1.42c
-                        Release date: 2025-04-21
+                              Version 1.42e
+                        Release date: 2025-05-27
 
                                   by
 

xtrn/DDAreaChoosers/version_history.txt

@@ -5,6 +5,8 @@ Revision History (change log)
 =============================
 Version  Date         Description
 -------  ----         -----------
+1.42e    2025-05-27   Fix: Name collapsing for group names w/ more than 1
+                      instance
 1.42d    2025-05-03   File area chooser only - Fix: Displays the configured
                       area change header again
 1.42c    2025-04-21   F & L keys working again on the light bar menu (first &