Merge pull request #364 from canjs/fix-search-results

Fix search results and keep them working in Safari

Author: chasenlehara

static/search.js

@@ -320,6 +320,7 @@ var Search = Control.extend({
 		if (index && currentIndexVersion === indexVersion) {
 			searchEngine = lunr.Index.load(index);
 		}else{
+			var dummyContainer = document.createElement('div');
 			searchEngine = lunr(function(){
 				lunr.tokenizer.separator = /[\s]+/;
 
@@ -340,6 +341,10 @@ var Search = Control.extend({
 					if(!item.title){
 						item.title = item.name;
 					}
+					// Convert HTML to text
+					dummyContainer.innerHTML = item.description;
+					item.description = dummyContainer.innerText;
+
 				    this.add(item);
 				  }
 				}
@@ -379,6 +384,8 @@ var Search = Control.extend({
 				var split = searchTerm.split(lunr.tokenizer.separator);
 				split.forEach(function(term) {
 					q.term(term, { boost: 10, fields: q.allFields });
+
+					q.term(term, { usePipeline: false, fields: q.allFields, wildcard: lunr.Query.wildcard.TRAILING });
 				});
 			});
 

test/search.js

@@ -27,7 +27,7 @@ QUnit.module('search control');
 QUnit.test('Search for “about”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('about').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('about', results), 0, 'first result is the About page');
     done();
   });
@@ -36,7 +36,7 @@ QUnit.test('Search for “about”', function(assert) {
 QUnit.test('Search for “can-component”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('can-component').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('can-component', results), 0, 'first result is the can-component page');
     done();
   });
@@ -45,7 +45,7 @@ QUnit.test('Search for “can-component”', function(assert) {
 QUnit.test('Search for “can-connect”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('can-connect').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('can-connect', results), 0, 'first result is the can-connect page');
     done();
   });
@@ -54,15 +54,15 @@ QUnit.test('Search for “can-connect”', function(assert) {
 QUnit.test('Search for “helpers/', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('helpers/').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     done();
   });
 });
 
 QUnit.test('Search for “Live Binding”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('Live Binding').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('can-stache.Binding', results) < 2, true, 'first result is the can-stache Live Binding page');
     done();
   });
@@ -80,7 +80,7 @@ QUnit.test('Search for “Play”', function(assert) {
 QUnit.test('Search for “stache”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('stache').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('can-stache', results), 0, 'first result is the can-stache page');
     done();
   });
@@ -98,7 +98,7 @@ QUnit.test('Search for “%special”', function(assert) {
 QUnit.test('Search for “define/map”', function(assert) {
   var done = assert.async();
   search.searchEngineSearch('define/map').then(function(results) {
-    assert.equal(results.length > 0, true, 'got results');
+    assert.equal(results.length > 1, true, 'got more than 1 result');
     assert.equal(indexOfPageInResults('can-define/map/map', results), 0, 'first result is the can-define/map/map page');
     done();
   });