From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 1 Oct 2018 16:57:04 +0000 (+0200)
Subject: wip #2251 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=14637e097c2c005d3ea8b6abc37a5f9e704f36c0;p=fluidbook-html5.git

wip #2251 @1
---

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index b7eca1e4..9f805665 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -70,7 +70,7 @@ FluidbookMenu.prototype = {
         var $this = this;
         var camelView = view.charAt(0).toUpperCase() + view.substr(1);
         var cb = function () {
-            $this.openingView(callback);
+            $this.openingView(callback, view);
         };
         if (view == 'index') {
             this.openIndex(this.fluidbook.l10n.__('overview'), undefined, true, cb);
@@ -104,7 +104,7 @@ FluidbookMenu.prototype = {
     openSearch: function (q, cb) {
         this.fluidbook.nav.openSearch(q, cb);
     },
-    openingView: function (callback) {
+    openingView: function (callback, view) {
         var $this = this;
         this.fluidbook.resize.resizeView();
         this.fluidbook.tooltip.hideTooltip();
@@ -120,7 +120,7 @@ FluidbookMenu.prototype = {
         var to = {y: "0px", opacity: 1};
         if (mview.hasClass('fs')) {
             from.y = "0px";
-        } else {
+        } else if (view !== 'search') {
             this.showOverlay();
         }
 
diff --git a/js/libs/fluidbook/fluidbook.search.js b/js/libs/fluidbook/fluidbook.search.js
index 37ef9e1f..ba76d3b6 100644
--- a/js/libs/fluidbook/fluidbook.search.js
+++ b/js/libs/fluidbook/fluidbook.search.js
@@ -91,7 +91,6 @@ FluidbookSearch.prototype = {
         for (var p in this.plugins) {
             var plugin = this.plugins[p];
             var h = plugin.getHints(q);
-            console.log(h);
             res = res.concat(h);
         }
 
@@ -318,6 +317,10 @@ FluidbookSearch.prototype = {
     },
     clearHighlights: function () {
         $("#searchHighlights").html('');
+        for (var p in this.plugins) {
+            var plugin = this.plugins[p];
+            plugin.clearHighlights();
+        }
     },
     highlightSearchTerms: function (pageNr) {
         if (!this.highlightEnabled) {
@@ -328,6 +331,11 @@ FluidbookSearch.prototype = {
             return;
         }
 
+        for (var p in this.plugins) {
+            var plugin = this.plugins[p];
+            plugin.highlight(pageNr, this.termsToHighlight);
+        }
+
         // Test if we highlight results
         if (!this.fluidbook.datas.highlightAllOccurences) {
             var evenPageNumber = pageNr;
@@ -425,8 +433,6 @@ FluidbookSearch.prototype = {
 
         this.menuSearchHints.fadeIn(300);
 
-        this.initSearchResults();
-
         // if (this.menuSearchHints.hasClass('mm-hidden')) {
         //     this.nav.menuAPI.openPanel(this.menuSearchHints, false);
         // }
diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js
index e43d06ac..c83a747d 100644
--- a/js/libs/fluidbook/special/wescosales.js
+++ b/js/libs/fluidbook/special/wescosales.js
@@ -337,4 +337,16 @@ WescoSalesSearchPlugin.prototype = {
 
         return !res;
     },
+
+    highlight: function (pageNr, terms) {
+        console.log(terms);
+        this.clearHighlights();
+        $.each(terms, function (k, v) {
+            console.log(v, $('[data-wescosales-ref="' + v + '"]'));
+            $('[data-wescosales-ref="' + v + '"]').addClass('highlight');
+        });
+    },
+    clearHighlights: function () {
+        $('[data-wescosales-ref].highlight').removeClass('highlight');
+    },
 };
\ No newline at end of file