From 5ca9d22276c106854d97d9b20d11da3ff840a0c4 Mon Sep 17 00:00:00 2001 From: Rodrigo Fernandes Date: Sun, 30 Oct 2022 20:31:33 +0000 Subject: [PATCH] fix side by side margins and highlight usage of object instead of map --- src/ui/css/diff2html.css | 2 -- src/ui/js/diff2html-ui-base.ts | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui/css/diff2html.css b/src/ui/css/diff2html.css index 8d68682..e387989 100644 --- a/src/ui/css/diff2html.css +++ b/src/ui/css/diff2html.css @@ -113,8 +113,6 @@ overflow-x: scroll; overflow-y: hidden; width: 50%; - margin-right: -4px; - margin-bottom: -8px; } .d2h-code-line { diff --git a/src/ui/js/diff2html-ui-base.ts b/src/ui/js/diff2html-ui-base.ts index 9a84326..e4f9ad5 100644 --- a/src/ui/js/diff2html-ui-base.ts +++ b/src/ui/js/diff2html-ui-base.ts @@ -146,6 +146,10 @@ export class Diff2HtmlUI { const language = file.getAttribute('data-lang'); + if (!(this.config.highlightLanguages instanceof Map)) { + this.config.highlightLanguages = new Map(Object.entries(this.config.highlightLanguages)); + } + const hljsLanguage = language && this.config.highlightLanguages.has(language) ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion