Merge pull request #1021 from matsluni/fix_#1015

= site: fix for #1015
spray · Mar 17, 2015 · 9757be6 · 9757be6
2 parents e9956bb + 3390f74
commit 9757be6
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 591 deletions.
diff --git a/site/src/main/resources/theme/css/spray.css b/site/src/main/resources/theme/css/spray.css
@@ -157,6 +157,7 @@ table.footnote td { vertical-align: top; }
 
 span.twitter-typeahead input[type=text] { width: 200px; margin: -5px 46px 0 0; }
 .tt-suggestion { white-space: nowrap; }
+.tt-empty-message { padding: 5px 10px; text-align: center; }
 
 @media (max-width: 979px) {
     #talk-link { display: none; }

diff --git a/site/src/main/resources/theme/css/typeahead.css b/site/src/main/resources/theme/css/typeahead.css
@@ -1,4 +1,4 @@
-.twitter-typeahead .tt-query,
+.twitter-typeahead .tt-input,
 .twitter-typeahead .tt-hint {
   margin-bottom: 0;
 }
@@ -28,7 +28,7 @@
   padding: 3px 20px;
 }
 
-.tt-suggestion.tt-is-under-cursor {
+.tt-suggestion.tt-cursor {
   color: #fff;
   background-color: #0081c2;
   background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
@@ -40,7 +40,7 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
 }
 
-.tt-suggestion.tt-is-under-cursor a {
+.tt-suggestion.tt-cursor a {
   color: #fff;
 }
 

diff --git a/site/src/main/resources/theme/js/highlight-directives.js b/site/src/main/resources/theme/js/highlight-directives.js
@@ -55,15 +55,36 @@ $(function() {
         });
     }
 
-    $('.typeahead')
-        .typeahead({
-            name: "documentation",
-            remote: "/search/documentation/typeahead?terms=%QUERY",
-            engine: Hogan,
-            limit: 10,
-            template: "<div>{{extra.parent}}:&nbsp;<strong>{{name}}</strong></div>"
-        })
-        .bind("typeahead:selected", function(event, datum) {
-            window.location = datum.url;
-        });
+    var suggestionsEngine = new Bloodhound({
+        datumTokenizer: function(d) {
+          return Bloodhound.tokenizers.whitespace(d.num);
+        },
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
+        name: "documentation",
+        limit: 10,
+        remote: "/search/documentation/typeahead?terms=%QUERY"
+    });
+
+    suggestionsEngine.initialize();
+
+    $('.typeahead').typeahead(
+    	  { minLength: 3 },
+    	  {
+    		    source: suggestionsEngine.ttAdapter(),
+    		    templates: {
+      			    empty: function(data) {
+                    return [
+        			          '<span class="tt-empty-message">',
+        			          'Could not find results for: <strong>'+data.query+'</strong>',
+        			          '</span>'].join('\n')
+                },
+      			    suggestion: function(data) {
+                    return '<div>'+data.extra.parent+':&nbsp;<strong>'+data.name+'</strong></div>'
+                }
+      		  }
+    	  }
+    )
+    .bind("typeahead:selected", function(event, datum) {
+        window.location = datum.url;
+    });
 });