Merge pull request #8724 from MarcelGerber/wp-docs-anchors

redmunds · redmunds · commit 4b3453ef31b2 · 2014-11-12T17:15:29.000-08:00
Make anchors in Quick Docs relative to page URL
diff --git a/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js b/src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
@@ -75,9 +75,14 @@ define(function (require, exports, module) {
         this.$wrapperDiv.find("a").each(function (index, elem) {
             var $elem = $(elem);
             var url = $elem.attr("href");
-            if (url && url.substr(0, 4) !== "http") {
-                // URLs in JSON data are relative
-                url = "https://docs.webplatform.org" + (url.charAt(0) !== "/" ? "/" : "") + url;
+            if (url) {
+                if (url.charAt(0) === "#") {
+                    // Anchors in JSON data are relative to page URL
+                    url = templateVars.url + url;
+                } else if (url.substr(0, 4) !== "http") {
+                    // URLs in JSON data are relative
+                    url = "https://docs.webplatform.org" + (url.charAt(0) !== "/" ? "/" : "") + url;
+                }
                 $elem.attr("href", url);
             }
             $elem.attr("title", url);
diff --git a/src/extensions/default/WebPlatformDocs/unittest-files/description.html b/src/extensions/default/WebPlatformDocs/unittest-files/description.html
@@ -4,4 +4,5 @@
 <a href="../relative/link" data-expected="https://docs.webplatform.org/../relative/link">relative</a>
 <a href="file:///someplace/bad" data-expected="https://docs.webplatform.org/file:///someplace/bad">file url</a>
 <a href="foo?querystring" data-expected="https://docs.webplatform.org/foo?querystring">querystring</a>
-<a href="#hash" data-expected="https://docs.webplatform.org/#hash">hash</a>
+<a href="#hash" data-expected="https://dev.brackets.io/wiki/css/properties/my-css-prop#hash">hash</a>
+<a href="foo#hash" data-expected="https://docs.webplatform.org/foo#hash">hash</a>
diff --git a/src/extensions/default/WebPlatformDocs/unittests.js b/src/extensions/default/WebPlatformDocs/unittests.js
@@ -206,8 +206,8 @@ define(function (require, exports, module) {
                     href,
                     $links = viewer.$htmlContent.find("a:not(.close)");
                 
-                // 7 links in description.html, 1 "more info" link in template
-                expect($links.length).toBe(8);
+                // 8 links in description.html, 1 "more info" link in template
+                expect($links.length).toBe(9);
                 
                 $links.each(function (i, anchor) {
                     $a = $(anchor);
