Merge latest changes from master and adapt highlighting to work with burgermenu searc...

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index c9edbf28efeb1aac04b5752bdfb98f0fd6048313..4ac825caef2d723b853f5fb640a52be6c0c742cc 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -644,7 +644,9 @@ FluidbookNav.prototype = {
 
                 });
 
-                // Todo: handle results.terms here... Highlighting?
+                // Set Highlighting of results keywords
+                $this.fluidbook.search.setHighlightTerms(results.terms);
+                $this.fluidbook.search.highlightSearchTerms($this.fluidbook.currentPage);
 
 
                 fluidbook.hideSearchHints();