diff options
| author | Huy Tran <hoang.huy.tran@gmail.com> | 2018-08-15 03:20:23 +0300 |
|---|---|---|
| committer | Huy Tran <hoang.huy.tran@gmail.com> | 2018-08-15 03:20:23 +0300 |
| commit | e23b920241d6ea15a9422f22767c74eeb424bfdc (patch) | |
| tree | 5b6c768dd96df476f60e139b55d5ccce6f9589e6 | |
| parent | 9cf91340bc0c888342069ad3e8b4f2e2b640c4c3 (diff) | |
better fix for #27v2.0.1
| -rw-r--r-- | layouts/partials/highlight-js.html | 27 |
1 files 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 }} |