xobs/fa20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clear existing matches when searching for empty string #1909

Browse Source
This commit is contained in:
Hakim El Hattab 2017-06-19 09:43:29 +02:00
parent 7d0d3c24ca
commit a781b6a22b
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugin/search/search.js
View File

@ -138,19 +138,27 @@ function Hilitor(id, tag)
if (searchboxDirty) { if (searchboxDirty) {
var searchstring = document.getElementById("searchinput").value; var searchstring = document.getElementById("searchinput").value;
//find the keyword amongst the slides if (searchstring === '') {
myHilitor = new Hilitor("slidecontent"); if(myHilitor) myHilitor.remove();
matchedSlides = myHilitor.apply(searchstring); matchedSlides = null;
currentMatchedIndex = 0; }
else {
//find the keyword amongst the slides
myHilitor = new Hilitor("slidecontent");
matchedSlides = myHilitor.apply(searchstring);
currentMatchedIndex = 0;
}
} }
//navigate to the next slide that has the keyword, wrapping to the first if necessary if (matchedSlides) {
if (matchedSlides.length && (matchedSlides.length <= currentMatchedIndex)) { //navigate to the next slide that has the keyword, wrapping to the first if necessary
currentMatchedIndex = 0; if (matchedSlides.length && (matchedSlides.length <= currentMatchedIndex)) {
} currentMatchedIndex = 0;
if (matchedSlides.length > currentMatchedIndex) { }
Reveal.slide(matchedSlides[currentMatchedIndex].h, matchedSlides[currentMatchedIndex].v); if (matchedSlides.length > currentMatchedIndex) {
currentMatchedIndex++; Reveal.slide(matchedSlides[currentMatchedIndex].h, matchedSlides[currentMatchedIndex].v);
currentMatchedIndex++;
}
} }
} }