Commit 94ea4bf4 authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Merge branch 'ddac_search_errors_fix' into 'master'

DD area choosers: Fixes for searching & related error reporting

See merge request !171
parents ff3603d6 9a393710
Pipeline #3045 passed with stage
in 9 minutes and 49 seconds
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
* 2022-03-18 Eric Oulashin Version 1.23 * 2022-03-18 Eric Oulashin Version 1.23
* For directory collapsing, if there's only one subdirectory, * For directory collapsing, if there's only one subdirectory,
* then it won't be collapsed. * 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: /* Command-line arguments:
...@@ -57,8 +60,8 @@ if (system.version_num < 31400) ...@@ -57,8 +60,8 @@ if (system.version_num < 31400)
} }
// Version & date variables // Version & date variables
var DD_FILE_AREA_CHOOSER_VERSION = "1.23"; var DD_FILE_AREA_CHOOSER_VERSION = "1.24";
var DD_FILE_AREA_CHOOSER_VER_DATE = "2022-03-18"; var DD_FILE_AREA_CHOOSER_VER_DATE = "2022-05-17";
// Keyboard input key codes // Keyboard input key codes
var CTRL_H = "\x08"; var CTRL_H = "\x08";
...@@ -1233,7 +1236,7 @@ function DDFileAreaChooser_SelectFileArea_Lightbar(pLevel, pLibIdx, pDirIdx) ...@@ -1233,7 +1236,7 @@ function DDFileAreaChooser_SelectFileArea_Lightbar(pLevel, pLibIdx, pDirIdx)
} }
else 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; drawMenu = false;
this.WriteKeyHelpLine(); this.WriteKeyHelpLine();
} }
...@@ -2664,8 +2667,8 @@ function findFileLibIdxFromText(pSearchText, pStartItemIdx) ...@@ -2664,8 +2667,8 @@ function findFileLibIdxFromText(pSearchText, pStartItemIdx)
var searchTextUpper = pSearchText.toUpperCase(); var searchTextUpper = pSearchText.toUpperCase();
for (var i = startIdx; i < file_area.lib_list.length; ++i) for (var i = startIdx; i < file_area.lib_list.length; ++i)
{ {
if ((file_area.lib_list.length[i].name.toUpperCase().indexOf(searchTextUpper) > -1) || if ((file_area.lib_list[i].name.toUpperCase().indexOf(searchTextUpper) > -1) ||
(file_area.lib_list.length[i].description.toUpperCase().indexOf(searchTextUpper) > -1)) (file_area.lib_list[i].description.toUpperCase().indexOf(searchTextUpper) > -1))
{ {
libIdx = i; libIdx = i;
break; break;
......
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
* Also fixed an issue: Using Q to quit out of the 2nd level * Also fixed an issue: Using Q to quit out of the 2nd level
* (sub-board/sub-group) for lightbar mode no longer quits * (sub-board/sub-group) for lightbar mode no longer quits
* out of the chooser altogether. * 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) ...@@ -68,8 +71,8 @@ if (system.version_num < 31400)
} }
// Version & date variables // Version & date variables
var DD_MSG_AREA_CHOOSER_VERSION = "1.23"; var DD_MSG_AREA_CHOOSER_VERSION = "1.24";
var DD_MSG_AREA_CHOOSER_VER_DATE = "2022-03-18"; var DD_MSG_AREA_CHOOSER_VER_DATE = "2022-05-17";
// Keyboard input key codes // Keyboard input key codes
var CTRL_H = "\x08"; var CTRL_H = "\x08";
...@@ -728,7 +731,7 @@ function DDMsgAreaChooser_SelectMsgArea_Lightbar(pLevel, pGrpIdx, pSubIdx) ...@@ -728,7 +731,7 @@ function DDMsgAreaChooser_SelectMsgArea_Lightbar(pLevel, pGrpIdx, pSubIdx)
} }
else 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; drawMenu = false;
this.WriteKeyHelpLine(); this.WriteKeyHelpLine();
} }
......
Digital Distortion Area Choosers Digital Distortion Area Choosers
Version 1.23 Version 1.24
Release date: 2022-03-18 Release date: 2022-05-17
by by
......
...@@ -5,6 +5,8 @@ Revision History (change log) ...@@ -5,6 +5,8 @@ Revision History (change log)
============================= =============================
Version Date Description 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 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 is only one sub-group/sub-library, then it won't be
collapsed, as that wouldn't be very useful. collapsed, as that wouldn't be very useful.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment