From 1f06511ad95b6fbccb98a20fce88f5cf76e2ec73 Mon Sep 17 00:00:00 2001
From: Eric Oulashin <eric.oulashin@gmail.com>
Date: Tue, 17 May 2022 12:47:01 -0700
Subject: [PATCH] Fixes for searching & related error reporting
---
xtrn/DDAreaChoosers/DDFileAreaChooser.js | 13 ++++++++-----
xtrn/DDAreaChoosers/DDMsgAreaChooser.js | 9 ++++++---
xtrn/DDAreaChoosers/readme.txt | 4 ++--
xtrn/DDAreaChoosers/revision_history.txt | 2 ++
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/xtrn/DDAreaChoosers/DDFileAreaChooser.js b/xtrn/DDAreaChoosers/DDFileAreaChooser.js
index 55b5702781..dfc730803f 100644
--- a/xtrn/DDAreaChoosers/DDFileAreaChooser.js
+++ b/xtrn/DDAreaChoosers/DDFileAreaChooser.js
@@ -20,6 +20,9 @@
* 2022-03-18 Eric Oulashin Version 1.23
* For directory collapsing, if there's only one subdirectory,
* then it won't be collapsed.
+ * 2022-05-17 Eric Oulashin Version 1.24
+ * Fixes for searching and search error reporting (probably
+ * due to mistaken copy & paste in an earlier commit)
*/
/* Command-line arguments:
@@ -57,8 +60,8 @@ if (system.version_num < 31400)
}
// Version & date variables
-var DD_FILE_AREA_CHOOSER_VERSION = "1.23";
-var DD_FILE_AREA_CHOOSER_VER_DATE = "2022-03-18";
+var DD_FILE_AREA_CHOOSER_VERSION = "1.24";
+var DD_FILE_AREA_CHOOSER_VER_DATE = "2022-05-17";
// Keyboard input key codes
var CTRL_H = "\x08";
@@ -1233,7 +1236,7 @@ function DDFileAreaChooser_SelectFileArea_Lightbar(pLevel, pLibIdx, pDirIdx)
}
else
{
- this.WriteLightbarKeyHelpErrorMsg("There is no previous search", REFRESH_MSG_AREA_CHG_LIGHTBAR_HELP_LINE);
+ this.WriteLightbarKeyHelpErrorMsg("There is no previous search", true);
drawMenu = false;
this.WriteKeyHelpLine();
}
@@ -2664,8 +2667,8 @@ function findFileLibIdxFromText(pSearchText, pStartItemIdx)
var searchTextUpper = pSearchText.toUpperCase();
for (var i = startIdx; i < file_area.lib_list.length; ++i)
{
- if ((file_area.lib_list.length[i].name.toUpperCase().indexOf(searchTextUpper) > -1) ||
- (file_area.lib_list.length[i].description.toUpperCase().indexOf(searchTextUpper) > -1))
+ if ((file_area.lib_list[i].name.toUpperCase().indexOf(searchTextUpper) > -1) ||
+ (file_area.lib_list[i].description.toUpperCase().indexOf(searchTextUpper) > -1))
{
libIdx = i;
break;
diff --git a/xtrn/DDAreaChoosers/DDMsgAreaChooser.js b/xtrn/DDAreaChoosers/DDMsgAreaChooser.js
index 3570f5559b..f268826850 100644
--- a/xtrn/DDAreaChoosers/DDMsgAreaChooser.js
+++ b/xtrn/DDAreaChoosers/DDMsgAreaChooser.js
@@ -26,6 +26,9 @@
* Also fixed an issue: Using Q to quit out of the 2nd level
* (sub-board/sub-group) for lightbar mode no longer quits
* out of the chooser altogether.
+ * 2022-05-17 Eric Oulashin Version 1.24
+ * Fix for search error reporting (probably due to
+ * mistaken copy & paste in an earlier commit)
*
*/
@@ -68,8 +71,8 @@ if (system.version_num < 31400)
}
// Version & date variables
-var DD_MSG_AREA_CHOOSER_VERSION = "1.23";
-var DD_MSG_AREA_CHOOSER_VER_DATE = "2022-03-18";
+var DD_MSG_AREA_CHOOSER_VERSION = "1.24";
+var DD_MSG_AREA_CHOOSER_VER_DATE = "2022-05-17";
// Keyboard input key codes
var CTRL_H = "\x08";
@@ -728,7 +731,7 @@ function DDMsgAreaChooser_SelectMsgArea_Lightbar(pLevel, pGrpIdx, pSubIdx)
}
else
{
- this.WriteLightbarKeyHelpErrorMsg("There is no previous search", REFRESH_MSG_AREA_CHG_LIGHTBAR_HELP_LINE);
+ this.WriteLightbarKeyHelpErrorMsg("There is no previous search", true);
drawMenu = false;
this.WriteKeyHelpLine();
}
diff --git a/xtrn/DDAreaChoosers/readme.txt b/xtrn/DDAreaChoosers/readme.txt
index 0039f6adbd..5b471c56ed 100644
--- a/xtrn/DDAreaChoosers/readme.txt
+++ b/xtrn/DDAreaChoosers/readme.txt
@@ -1,6 +1,6 @@
Digital Distortion Area Choosers
- Version 1.23
- Release date: 2022-03-18
+ Version 1.24
+ Release date: 2022-05-17
by
diff --git a/xtrn/DDAreaChoosers/revision_history.txt b/xtrn/DDAreaChoosers/revision_history.txt
index f364e2a79d..11797ee6a9 100644
--- a/xtrn/DDAreaChoosers/revision_history.txt
+++ b/xtrn/DDAreaChoosers/revision_history.txt
@@ -5,6 +5,8 @@ Revision History (change log)
=============================
Version Date Description
------- ---- -----------
+1.24 2022-05-17 Fix for searching & error reporting (probably due to a
+ mistaken copy & paste in a past commit)
1.23 2022-03-18 For message sub-board/file directory collapsing, if there
is only one sub-group/sub-library, then it won't be
collapsed, as that wouldn't be very useful.
--
GitLab