Fixed line highlighting

4 years ago · 50e16d87cb
4 changed files with 8 additions and 7 deletions
--- a/Teknik/Areas/Paste/Views/Paste/Full.cshtml
+++ b/Teknik/Areas/Paste/Views/Paste/Full.cshtml
@ -6,7 +6,7 @@
				@@ -6,7 +6,7 @@
    string format = Model.Syntax;
    string formatName = "Text";

-    if (HighlightHelper.Languages.ContainsKey(format))
+    if (!string.IsNullOrEmpty(format) && HighlightHelper.Languages.ContainsKey(format))
    {
        formatName = HighlightHelper.Languages[format];
    }
@ -48,7 +48,7 @@
				@@ -48,7 +48,7 @@
    <br />
    <div class="row">
        <div class="col-sm-12">
-            <pre class="line-numbers"><code class="language-@(format)">@Model.Content</code></pre>
+            <pre class="line-numbers" id="code"><code class="language-@(format)">@Model.Content</code></pre>
        </div>
    </div>
 </div>
--- a/Teknik/Areas/Paste/Views/Paste/Simple.cshtml
+++ b/Teknik/Areas/Paste/Views/Paste/Simple.cshtml
@ -4,7 +4,8 @@
				@@ -4,7 +4,8 @@
    Layout = null;
    string format = Model.Syntax;
    string formatName = "Text";
-    if (HighlightHelper.Languages.ContainsKey(format))
+
+    if (!string.IsNullOrEmpty(format) && HighlightHelper.Languages.ContainsKey(format))
    {
        formatName = HighlightHelper.Languages[format];
    }
@ -26,7 +27,7 @@
				@@ -26,7 +27,7 @@
 </head>
 <body data-twttr-rendered="true">

-    <pre class="line-numbers"><code class="language-@(format)">@Model.Content</code></pre>
+    <pre class="line-numbers" id="code" style="border: none;"><code class="language-@(format)">@Model.Content</code></pre>
    
    <bundle src="js/common.min.js" append-version="true"></bundle>
    <bundle src="js/paste.view.min.js" append-version="true"></bundle>
--- a/Teknik/Areas/Vault/Views/Vault/PasteItem.cshtml
+++ b/Teknik/Areas/Vault/Views/Vault/PasteItem.cshtml
@ -4,7 +4,7 @@
				@@ -4,7 +4,7 @@
    string format = Model.Paste.Syntax;
    string formatName = "Text";

-    if (HighlightHelper.Languages.ContainsKey(format))
+    if (!string.IsNullOrEmpty(format) && HighlightHelper.Languages.ContainsKey(format))
    {
        formatName = HighlightHelper.Languages[format];
    }
@ -39,7 +39,7 @@
				@@ -39,7 +39,7 @@
                }
                else
                {
-                    <pre class="line-numbers"><code class="language-@(format)">@Model.Paste.Content</code></pre>
+                    <pre class="line-numbers" id="code-@(Model.VaultItemId)"><code class="language-@(format)">@Model.Paste.Content</code></pre>
                }
            </div>
            <div class="show-more" id="show-more-bottom-@Model.VaultItemId">
--- a/Teknik/Scripts/lib/Prism/prism-line-highlight.js
+++ b/Teknik/Scripts/lib/Prism/prism-line-highlight.js
@ -118,7 +118,7 @@ function applyHash() {
				@@ -118,7 +118,7 @@ function applyHash() {

 	highlightLines(pre, range, 'temporary ');

-	document.querySelector('.temporary.line-highlight').scrollIntoView();
+    document.querySelector('.temporary.line-highlight').scrollIntoView();
 }

 var fakeTimer = 0; // Hack to limit the number of times applyHash() runs