diff --git a/xtrn/DDMsgReader/DDMsgReader.js b/xtrn/DDMsgReader/DDMsgReader.js index d618e7b8396fe8035c3b877f3637f4507afe68d6..52ca429793808f4a85f349ba4aeb0d29388c1d39 100644 --- a/xtrn/DDMsgReader/DDMsgReader.js +++ b/xtrn/DDMsgReader/DDMsgReader.js @@ -1753,7 +1753,7 @@ function DigDistMsgReader_SearchMessages(pSearchModeStr, pSubBoardCode, pScanSco { var formattedText = format(this.text.searchingSubBoardAbovePromptText, subBoardGrpAndName(bbs.cursub_code)); //console.print("\x01n" + replaceAtCodesInStr(formattedText) + "\x01n"); - console.putmst("\x01n" + formattedText + "\x01n"); + console.putmsg("\x01n" + formattedText + "\x01n"); } console.crlf(); } diff --git a/xtrn/ddfilelister/ddfilelister.js b/xtrn/ddfilelister/ddfilelister.js index 8f5da9e3974909ea6ce249d6cdceed507f55c940..eb7c1d26f830a61f520978993259c116abed90c1 100644 --- a/xtrn/ddfilelister/ddfilelister.js +++ b/xtrn/ddfilelister/ddfilelister.js @@ -581,7 +581,7 @@ function showFileInfo(pFileList, pFileListMenu) // may be a kludge, and perhaps there's a better solution.. fileDesc = fileDesc.replace(/^\x01[nN]/, ""); // Fix line endings if necessary - fileDesc = fixStrLineEndings(fileDesc); + fileDesc = lfexpand(fileDesc); } else fileDesc = ""; @@ -694,21 +694,6 @@ function splitStrAndCombineWithRN(pStr, pSplitStr) return newStr; } -// Fixes line endings in a string -function fixStrLineEndings(pStr) -{ - if (typeof(pStr) !== "string") - return ""; - - // If there's only a return or only a newline, split & recombine with \r\n - var newStr = pStr; - if (/[^\r]\n[^\r]/.test(newStr)) // Only a newline - newStr = splitStrAndCombineWithRN(newStr, "\n"); - else if (/[^\n]\r[^\n]/.test(newStr)) // Only a carriage return - newStr = splitStrAndCombineWithRN(newStr, "\r"); - return newStr; -} - // Lets the user view a file. // // Parameters: @@ -3227,7 +3212,7 @@ function populateFileList(pSearchMode) { gFileList[i].extdesc = gFileList[i].extdesc.substr(0, gFileList[i].extdesc.length-2); // Fix line endings if necessary - gFileList[i].extdesc = fixStrLineEndings(gFileList[i].extdesc); + gFileList[i].extdesc = lfexpand(gFileList[i].extdesc); } } }