From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 20 Sep 2017 16:18:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/burgermenu' into searchengine
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=33943d0d49f91e848c3e06b53f6da5c8a30aa676;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/burgermenu' into searchengine

# Conflicts:
#	js/libs/fluidbook/fluidbook.js
#	js/libs/fluidbook/fluidbook.nav.js
#	js/main.js
---

33943d0d49f91e848c3e06b53f6da5c8a30aa676
diff --cc js/main.js
index d3c08a45,2e4a21b5..2e5f9e93
--- a/js/main.js
+++ b/js/main.js
@@@ -503,12 -502,18 +503,17 @@@ function setBackground(page, resolution
  }
  
  function searchHints() {
 -    if ($("#q").val().length >= 3) {
 -        fluidbook.initSearchHints();
 -        fluidbook.getSearchHints($("#q").val());
 +    if ($("#q").val().length >= 1) {
++        fluidbook.search.initSearchHints();
 +        fluidbook.search.getSearchHints($("#q").val());
      } else {
          try {
-             fluidbook.search.hideSearchHints();
+             if ($("#q").val().length == 0) {
 -                fluidbook.hideSearchHints();
 -                fluidbook.hideSearchResults();
++                fluidbook.search.hideSearchHints();
++                fluidbook.search.hideSearchResults();
+                 fluidbook.showMenuItems(); // Show main menu items that were hidden previously
+             }
          } catch (err) {
 -
          }
      }
  }