From a07fd772ef56afe28211e328f9fa02f52ce92cec Mon Sep 17 00:00:00 2001 From: Regis Philibert Date: Thu, 23 Sep 2021 11:52:47 -0400 Subject: [PATCH] Use `internal` key for style/scripts instead of `inline` Fixes #34 --- core/scripts/private/GetDeclaredScripts.html | 4 ++-- core/scripts/private/GetTags.html | 2 +- core/styles/private/GetTags.html | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/scripts/private/GetDeclaredScripts.html b/core/scripts/private/GetDeclaredScripts.html index f28e5ab..717c971 100644 --- a/core/scripts/private/GetDeclaredScripts.html +++ b/core/scripts/private/GetDeclaredScripts.html @@ -36,7 +36,7 @@ we therfore default on "none" for $defines, and test the type of context from within the partial */}} {{ $defines := $script.defines | default "none" }} {{ $defines = partialCached "huge/scripts/private/GetDefines" $defines $defines }} - {{ $inline := $script.inline | default false }} + {{ $internal := $script.internal | default false }} {{ $inject := $script.inject | default slice }} {{ $externals := $script.externals | default slice }} {{ $format := $script.format | default "iife" }} @@ -55,7 +55,7 @@ "defines" $defines "format" $format "integrity" $integrity - "inline" $inline + "internal" $internal "inject" $inject "externals" $externals "minify" $minify diff --git a/core/scripts/private/GetTags.html b/core/scripts/private/GetTags.html index abf1b01..7a5758b 100644 --- a/core/scripts/private/GetTags.html +++ b/core/scripts/private/GetTags.html @@ -51,7 +51,7 @@ }} {{/* If inline, we overwrite previously set $tag */}} - {{ if $script.inline }} + {{ if $script.internal }} {{ $tag = dict "name" "script" "inner" .Content diff --git a/core/styles/private/GetTags.html b/core/styles/private/GetTags.html index 1360f75..09123c2 100644 --- a/core/styles/private/GetTags.html +++ b/core/styles/private/GetTags.html @@ -40,7 +40,7 @@ {{ range $style := $styles }} {{ $transformations := delimit $style.transformations ", " | default "none" }} {{ with partialCached "huge/styles/private/transform/_" . .name }} - {{/* Default assumes this is a link rather than inline */}} + {{/* Default assumes this is external (link) rather than internal */}} {{ $tag := dict "name" "link" "attr" (dict @@ -49,8 +49,8 @@ ) }} - {{/* If inline, we overwrite previously set $tag */}} - {{ if $style.inline }} + {{/* If internal, we overwrite previously set $tag */}} + {{ if $style.internal }} {{ $tag = dict "name" "style" "inner" .Content