From e23b920241d6ea15a9422f22767c74eeb424bfdc Mon Sep 17 00:00:00 2001
From: Huy Tran <hoang.huy.tran@gmail.com>
Date: Wed, 15 Aug 2018 07:20:23 +0700
Subject: [PATCH] better fix for #27

---
 layouts/partials/highlight-js.html | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index 5a0eea9..0606d79 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -1,15 +1,18 @@
 {{ if .Site.Params.highlightjs }}
-    {{ $hl := newScratch }}
-    {{ $hl.Set "languages" .Site.Params.highlightjslanguages }}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
-    {{ with $hl.Get "languages" }}
-        {{ range . }}
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
+    {{ if or (not (isset .Params "highlight")) (not .Params.highlight) }}
+        {{ $hl := newScratch }}
+        {{ $hl.Set "languages" (union (.Site.Params.highlightjslanguages) (.Params.highlightjslanguages)) }}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+        {{ with $hl.Get "languages" }}
+            {{ range . }}
+                <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
+            {{ end }}
+            
         {{ end }}
-    {{ end }}
-    <script type="text/javascript">
-        hljs.configure({languages: []});
-        hljs.initHighlightingOnLoad();
-    </script>
-    {{ $hl.Delete "languages" }}
+        <script type="text/javascript">
+            hljs.configure({languages: []});
+            hljs.initHighlightingOnLoad();
+        </script>
+        {{ $hl.Delete "languages" }}
+    {{ end }}    
 {{ end }}