Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Made searching for most punctuation work and highlight correctly.

This commit is contained in:
Robbie Antenesse 2016-02-27 10:10:11 -07:00
parent 989b67f923
commit ab61fdcfb8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/dictionaryBuilder.js
View File

@ -162,7 +162,6 @@ function ShowDictionary() {
var searchDictionaryJSON = htmlEntitiesParseForSearch(JSON.stringify(currentDictionary)); var searchDictionaryJSON = htmlEntitiesParseForSearch(JSON.stringify(currentDictionary));
if (searchIgnoreCase) { if (searchIgnoreCase) {
search = search.toLowerCase(); search = search.toLowerCase();
//searchDictionaryJSON = searchDictionaryJSON.toLowerCase();
} }
if (searchIgnoreDiacritics) { if (searchIgnoreDiacritics) {
search = removeDiacritics(search); search = removeDiacritics(search);
@ -218,7 +217,7 @@ function DictionaryEntry(itemIndex) {
displayPublic = (typeof displayPublic !== 'undefined' && displayPublic != null) ? displayPublic : false; displayPublic = (typeof displayPublic !== 'undefined' && displayPublic != null) ? displayPublic : false;
var entryText = "<entry><a name='" + currentDictionary.words[itemIndex].wordId + "'></a><a href='#" + currentDictionary.words[itemIndex].wordId + "' class='wordLink clickable'>&#x1f517;</a>"; var entryText = "<entry><a name='" + currentDictionary.words[itemIndex].wordId + "'></a><a href='#" + currentDictionary.words[itemIndex].wordId + "' class='wordLink clickable'>&#x1f517;</a>";
var searchTerm = document.getElementById("searchBox").value; var searchTerm = regexParseForSearch(document.getElementById("searchBox").value);
var searchByWord = document.getElementById("searchOptionWord").checked; var searchByWord = document.getElementById("searchOptionWord").checked;
var searchBySimple = document.getElementById("searchOptionSimple").checked; var searchBySimple = document.getElementById("searchOptionSimple").checked;
var searchByLong = document.getElementById("searchOptionLong").checked; var searchByLong = document.getElementById("searchOptionLong").checked;
@ -684,11 +683,15 @@ function stripHtmlEntities(string) {
} }
function htmlEntitiesParseForSearchEntry(string) { function htmlEntitiesParseForSearchEntry(string) {
return String(string).replace(/"/g, '%%').replace(/'/g, "``"); return String(string).replace(/"/g, '%%%%').replace(/'/g, "````");
} }
function htmlEntitiesParseForSearch(string) { function htmlEntitiesParseForSearch(string) {
return String(string).replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '%%').replace(/&apos;/g, "``"); return String(string).replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '%%%%').replace(/&apos;/g, "````");
}
function regexParseForSearch(string) {
return String(string).replace(/([\[\\\^\$\.\|\?\*\+\(\)\{\}\]])/g, "\\$1");
} }
function dynamicSort(property) { function dynamicSort(property) {