Merge pull request #1917 from mateuszbartosik/master

RDoc-3054 Fix for content-frame; make h6 linkable
ravendb · Oct 2, 2024 · 0a27d40 · 0a27d40
2 parents fab3444 + d160a5c
commit 0a27d40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Raven.Documentation.Parser/DocumentBuilder.cs b/Raven.Documentation.Parser/DocumentBuilder.cs
@@ -50,7 +50,7 @@ public string Build(FolderItem page)
             {
                 _content = NoteBlockHelper.GenerateNoteBlocks(_content);
                 _content = PanelBlockHelper.GeneratePanelBlocks(_content);
-                _content = CodeBlockHelper.GenerateCodeExamples(_content);
+                _content = CodeBlockHelper.GenerateContentFrames(_content);
             }
 
             if (_codeBlocks != null)

diff --git a/Raven.Documentation.Parser/Helpers/DocumentBuilding/CodeBlockHelper.cs b/Raven.Documentation.Parser/Helpers/DocumentBuilding/CodeBlockHelper.cs
@@ -38,7 +38,7 @@ public class CodeBlockHelper
 
         private static readonly Regex CodeTabBlockFinder = new Regex(@"{CODE-TAB-BLOCK:(.+?)}(.*?){CODE-TAB-BLOCK/}", RegexOptions.Compiled | RegexOptions.Singleline);
 
-        private static readonly Regex CodeExampleFinder = new Regex(@"{CODE-EXAMPLE:(.+?)}(.*?){CODE-EXAMPLE/}", RegexOptions.Compiled | RegexOptions.Singleline);
+        private static readonly Regex ContentFrameFinder = new Regex(@"{CONTENT-FRAME:(.+?)}(.*?){CONTENT-FRAME/}", RegexOptions.Compiled | RegexOptions.Singleline);
 
         private static readonly Regex FirstLineSpacesFinder = new Regex(@"^(\s|\t)+", RegexOptions.Compiled);
 
@@ -102,17 +102,15 @@ public static string GenerateCodeBlocks(string content, string documentationVers
             return content;
         }
 
-        public static string GenerateCodeExamples(string content)
+        public static string GenerateContentFrames(string content)
         {
-            content = CodeExampleFinder.Replace(content, match => GenerateCodeExample(match.Groups[1].Value.Trim(), match.Groups[2].Value.Trim()));
+            content = ContentFrameFinder.Replace(content, match => GenerateContentFrame(match.Groups[1].Value.Trim(), match.Groups[2].Value.Trim()));
 
             return content;
         }
 
-        private static string GenerateCodeExample(string title, string content)
+        private static string GenerateContentFrame(string title, string content)
         {
-            content = NormalizeContent(content);
-
             var builder = new StringBuilder();
             builder.AppendLine("<div class='content-frame'>");
             if (string.IsNullOrWhiteSpace(title) == false)

diff --git a/Raven.Documentation.Web/Views/Docs/_Layout.cshtml b/Raven.Documentation.Web/Views/Docs/_Layout.cshtml
@@ -133,7 +133,7 @@
             }
         });
         document.addEventListener("DOMContentLoaded", function() {
-            Array.prototype.slice.call(document.querySelectorAll("#articleContainer h1, #articleContainer h2, #articleContainer h3, #articleContainer h4, #articleContainer h5")).forEach(function(e) {
+            Array.prototype.slice.call(document.querySelectorAll("#articleContainer h1, #articleContainer h2, #articleContainer h3, #articleContainer h4, #articleContainer h5, #articleContainer h6")).forEach(function(e) {
                 if (e.getAttribute("id")) {
                     var t = e.innerHTML;
                     var r = document.createElement("a");