Merge pull request #106 from webbuilders-group/anchor-links-fix

BUGFIX: Fixed incorrectly formed page specific anchor links (fixes #104)
silverstripe · Mar 11, 2016 · 05741b1 · 05741b1
2 parents 5d28a93 + 91a0767
commit 05741b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/code/DocumentationParser.php b/code/DocumentationParser.php
@@ -482,6 +482,9 @@ public static function rewrite_relative_links($md, $page)
                         $fileBaseLink,
                         $url
                     );
+                } else if (preg_match('/^#/', $url)) {
+                    // for relative links begining with a hash use the current page link
+                    $relativeUrl = Controller::join_links($baselink, $page->getRelativeLink(), $url);
                 } else {
                     // Rewrite public URL
                     if (preg_match('/^\//', $url)) {

diff --git a/javascript/DocumentationViewer.js b/javascript/DocumentationViewer.js
@@ -120,7 +120,7 @@
 		 *
 		 * Automatically adds anchor links to headings that have IDs
 		 */
-		var url = window.location.href;
+		var url = window.location.href.replace(/#[a-zA-Z0-9\-\_]*/g, '');
 
 		$("#content h1[id], #content h2[id], #content h3[id], #content h4[id], #content h5[id], #content h6[id]").each(function() {
 			var link = '<a class="heading-anchor-link" title="Link to this section" href="'+ url + '#' + $(this).attr('id') + '">&para;</a>';

diff --git a/tests/DocumentationParserTest.php b/tests/DocumentationParserTest.php
@@ -197,6 +197,16 @@ public function testRelativeLinks()
             $result
         );
 
+        $this->assertContains(
+            '[link: with anchor](dev/docs/en/documentationparsertest/2.4/test/#anchor)',
+            $result
+        );
+
+        $this->assertContains(
+            '[link: relative anchor](dev/docs/en/documentationparsertest/2.4/test/#relative-anchor)',
+            $result
+        );
+
         $result = DocumentationParser::rewrite_relative_links(
             $this->subPage->getMarkdown(),
             $this->subPage

diff --git a/tests/docs/en/test.md b/tests/docs/en/test.md
@@ -8,6 +8,7 @@ test
 [link: subfolder page](subfolder/subpage)
 [link: with anchor](/test#anchor)
 [link: http](http://silverstripe.org)
+[link: relative anchor](#relative-anchor)
 
 `[Title](api:DataObject)`
 `[Title](api:DataObject::$defaults)`