Merge pull request #256 from canjs/fix-search-url-prefix

imaustink · web-flow · commit 844f9aaec1d0 · 2017-05-23T16:51:02.000-07:00
Fixed search URL prefix bug. Related to #123
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 temp/
 index.html
+.vscode
diff --git a/static/search.js b/static/search.js
@@ -508,11 +508,11 @@ var Search = Control.extend({
 						pathPrefix: (self.options.pathPrefix === '.') ? '' : '/' + self.options.pathPrefix + '/'
 					},{
 						docUrl: function(){
-							if(!docObject.pathToRoot){
+							if(!self.options.pathPrefix){
 								return this.url;
 							}
 
-							var root = joinURIs(window.location.href, docObject.pathToRoot);
+							var root = joinURIs(window.location.href, self.options.pathPrefix);
 							if(root.substr(-1) === "/"){
 								root = root.substr(0, root.length-1);
 							}

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 node_modules/
 temp/
 index.html
 +.vscode
Original file line number	Diff line number	Diff line change
`@@ -508,11 +508,11 @@ var Search = Control.extend({`
`508`	`508`	`pathPrefix: (self.options.pathPrefix === '.') ? '' : '/' + self.options.pathPrefix + '/'`
`509`	`509`	`},{`
`510`	`510`	`docUrl: function(){`
`511`		`- if(!docObject.pathToRoot){`
	`511`	`+ if(!self.options.pathPrefix){`
`512`	`512`	`return this.url;`
`513`	`513`	`}`
`514`	`514`
`515`		`- var root = joinURIs(window.location.href, docObject.pathToRoot);`
	`515`	`+ var root = joinURIs(window.location.href, self.options.pathPrefix);`
`516`	`516`	`if(root.substr(-1) === "/"){`
`517`	`517`	`root = root.substr(0, root.length-1);`
`518`	`518`	`}`