Merge pull request #326 from canjs/fix-search-urls

Make search links relative

Author: imaustink

static/canjs.js

@@ -95,7 +95,7 @@ function init() {
 				window.history.pushState(null, null, href);
 				navigate(href);
 			},
-			pathPrefix: '/doc',
+			pathPrefix: window.pathPrefix,
 			animateInOnStart: !hasShownSearch
 		});
 	}
@@ -237,6 +237,11 @@ function navigate(href) {
 
 			init();
 			setDocTitle();
+
+			searchControl.options.pathPrefix = window.pathPrefix;
+			if(searchControl.searchResultsCache){
+				searchControl.renderSearchResults(searchControl.searchResultsCache);
+			}
 		},
 		error: function() {
 			// just reload the page if this fails

static/search.js

@@ -59,6 +59,7 @@ var Search = Control.extend({
 
 	storageFallback: {},
 	useLocalStorage: false,
+	searchResultsCache: null,
 
 	// ---- END PROPERTIES ---- //
 
@@ -502,40 +503,45 @@ var Search = Control.extend({
 		var self = this;
 		this.searchDebounceHandle = setTimeout(function(){
 			self.searchEngineSearch(value).then(function(results) {
-				var numResults = results.length;
-				if (numResults > 50) {
-					numResults = '50+';
-					results = results.slice(0, 50);
+				self.searchResultsCache = results;
+				self.renderSearchResults(results);
+			});
+		}, this.options.searchTimeout);
+	},
+
+	renderSearchResults: function(results){
+		var self = this;
+		var numResults = results.length;
+		if (numResults > 50) {
+			numResults = '50+';
+			results = results.slice(0, 50);
+		}
+		var resultsFrag = this.options.resultsRenderer({
+			results: results,
+			numResults: numResults,
+			searchValue: this.searchTerm
+		},{
+			docUrl: function(){
+				if(self.options.pathPrefix){
+					return self.options.pathPrefix + "/" + this.url;
 				}
-				var resultsFrag = self.options.resultsRenderer({
-					results: results,
-					numResults: numResults,
-					searchValue:value,
-					pathPrefix: (self.options.pathPrefix === '.') ? '' : '/' + self.options.pathPrefix + '/'
-				},{
-					docUrl: function(){
-						if(self.options.pathPrefix){
-							return self.options.pathPrefix + "/" + this.url;
-						}
-				
-						if(this.url.substr(-1) === "/"){
-							return this.url;
-						}
 
-						return "/" + this.url;
-					}
-				});
+				if(this.url.substr(-1) === "/"){
+					return this.url;
+				}
 
-				self.$resultsWrap.empty();
-				self.$resultsWrap[0].appendChild(resultsFrag);
+				return "/" + this.url;
+			}
+		});
 
-				//refresh necessary dom
-				self.$resultsList = null;
-				if(numResults){
-					self.$resultsList = self.$resultsWrap.find(".search-results > ul");
-				}
-			});
-		}, this.options.searchTimeout);
+		this.$resultsWrap.empty();
+		this.$resultsWrap[0].appendChild(resultsFrag);
+
+		//refresh necessary dom
+		this.$resultsList = null;
+		if(numResults){
+			this.$resultsList = this.$resultsWrap.find(".search-results > ul");
+		}
 	},
 
 	// ---- SHOW/HIDE ---- //