Merge pull request #357 from canjs/fix-description-link-paths

Fixed description link paths

Author: imaustink

package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "bit-docs-generate-html": "^0.6.0",
-    "bit-docs-generate-searchmap": "^0.1.2",
+    "bit-docs-generate-searchmap": "^0.1.3",
     "bit-docs-html-toc": "^0.6.0",
     "connect": "^3.5.0",
     "normalize.css": "^5.0.0",

static/search.js

@@ -505,25 +505,33 @@ var Search = Control.extend({
 			numResults: numResults,
 			searchValue: this.searchTerm
 		},{
-			docUrl: function(){
+			docUrl: function(url){
 				if(self.options.pathPrefix){
-					return self.options.pathPrefix + "/" + this.url;
+					return self.options.pathPrefix + "/" + url;
 				}
 
-				if(this.url.substr(-1) === "/"){
+				if(url.substr(-1) === "/"){
 					return this.url;
 				}
 
-				return "/" + this.url;
+				return "/" + url;
 			},
-			addTargetToExternalURLs: function(html){
+			addTargetToExternalURLs: function(html, parentHref){
 				var $html = $('<div>').html(html);
 				$html.find('a').each(function(){
 					var $a = $(this);
-					var a = $a[0];
-					if(a.hostname !== location.hostname || a.protocol !== location.protocol){
+					var isLocal = this.hostname === location.hostname;
+					var isRelative = this.getAttribute('href').indexOf(location.hostname) === -1;
+					if(!isLocal || this.protocol !== location.protocol){
 						$a.attr('target', '_blank');
 					}
+					if(isLocal && isRelative){
+						// These links are generated by bit-docs and are relative to the page they are from
+						// so we need to get the path prefix of the parent a tag
+						var prefix = parentHref.substr(0, parentHref.lastIndexOf('/'));
+						var href = prefix + '/' + $a.attr('href');
+						$a.attr('href', href);
+					}
 				});
 				return $html.contents();
 			}

templates/search-results.stache

@@ -16,7 +16,7 @@
     <ul>
       {{#each results as result}}
         <li>
-          <a href="{{docUrl}}" title="{{result.name}}" class="result-name">
+          <a href="{{docUrl(result.url)}}" title="{{result.name}}" class="result-name">
             {{#if result.title}}{{result.title}}{{else}}{{result.name}}{{/if}}
 
 
@@ -30,7 +30,7 @@
 
             {{#if result.description}}
               <div class="result-description" title="{{result.description}}">
-                {{{addTargetToExternalURLs(result.description)}}}
+                {{{addTargetToExternalURLs(result.description, docUrl(result.url))}}}
               </div>
             {{/if}}
           </a>