From 194171c38ada33084f4483f0e8f0cf51fb4a81bb Mon Sep 17 00:00:00 2001
From: zzossig <zzossig@gmail.com>
Date: Sun, 1 Dec 2019 16:14:32 +0900
Subject: [PATCH] Better loading library approach

---
 assets/sass/main.scss                       | 28 ++++++++---------
 layouts/partials/functions/parse_grid.html  | 13 --------
 layouts/partials/functions/parse_theme.html |  5 ---
 layouts/partials/script/single-script.html  | 34 ++++++++++-----------
 4 files changed, 29 insertions(+), 51 deletions(-)
 delete mode 100644 layouts/partials/functions/parse_grid.html
 delete mode 100644 layouts/partials/functions/parse_theme.html

diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index dbb3cfd..2ba3044 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -1,20 +1,16 @@
-{{- partial "functions/parse_theme" . -}}
-{{- partial "functions/parse_grid" . -}}
-{{- $scr := .Scratch -}}
+$grid_max_width: {{ .Site.Data.grid.grid_max_width }};
+$grid_max_unit: {{ .Site.Data.grid.grid_max_unit }};
+$grid_main_main_width: {{ .Site.Data.grid.grid_main_main_width }};
+$grid_main_main_unit: {{ .Site.Data.grid.grid_main_main_unit }};
+$grid_main_side_width: {{ .Site.Data.grid.grid_main_side_width }};
+$grid_main_side_unit: {{ .Site.Data.grid.grid_main_side_unit }};
+$grid_column_gap_width: {{ .Site.Data.grid.grid_column_gap_width }};
+$grid_column_gap_unit: {{ .Site.Data.grid.grid_column_gap_unit }};
+$grid_navbar_height: {{ .Site.Data.grid.grid_navbar_height }};
+$grid_row_gap: {{ .Site.Data.grid.grid_row_gap }};
 
-$grid_max_width: {{ $scr.Get "grid_max_width" }};
-$grid_max_unit: {{ $scr.Get "grid_max_unit" }};
-$grid_main_main_width: {{ $scr.Get "grid_main_main_width" }};
-$grid_main_main_unit: {{ $scr.Get "grid_main_main_unit" }};
-$grid_main_side_width: {{ $scr.Get "grid_main_side_width" }};
-$grid_main_side_unit: {{ $scr.Get "grid_main_side_unit" }};
-$grid_column_gap_width: {{ $scr.Get "grid_column_gap_width" }};
-$grid_column_gap_unit: {{ $scr.Get "grid_column_gap_unit" }};
-$grid_navbar_height: {{ $scr.Get "grid_navbar_height" }};
-$grid_row_gap: {{ $scr.Get "grid_row_gap" }};
-
-$custom_theme_primary_color: {{ $scr.Get "custom_theme_primary_color" }};
-$chroma_theme: {{ $scr.Get "chroma_theme" }};
+$custom_theme_primary_color: {{ .Site.Data.skin.custom_theme_primary_color }};
+$chroma_theme: {{ .Site.Data.skin.chroma_theme }};
 
 @import 'abstracts/variables';
 @import 'abstracts/mixins';
diff --git a/layouts/partials/functions/parse_grid.html b/layouts/partials/functions/parse_grid.html
deleted file mode 100644
index e9d482d..0000000
--- a/layouts/partials/functions/parse_grid.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- $scr := .Scratch -}}
-{{ $grid := .Site.Data.grid }}
-
-{{- $scr.Set "grid_max_width" $grid.grid_max_width -}}
-{{- $scr.Set "grid_max_unit" $grid.grid_max_unit -}}
-{{- $scr.Set "grid_main_main_width" $grid.grid_main_main_width -}}
-{{- $scr.Set "grid_main_main_unit" $grid.grid_main_main_unit -}}
-{{- $scr.Set "grid_main_side_width" $grid.grid_main_side_width -}}
-{{- $scr.Set "grid_main_side_unit" $grid.grid_main_side_unit -}}
-{{- $scr.Set "grid_column_gap_width" $grid.grid_column_gap_width -}}
-{{- $scr.Set "grid_column_gap_unit" $grid.grid_column_gap_unit -}}
-{{- $scr.Set "grid_navbar_height" $grid.grid_navbar_height -}}
-{{- $scr.Set "grid_row_gap" $grid.grid_row_gap -}}
\ No newline at end of file
diff --git a/layouts/partials/functions/parse_theme.html b/layouts/partials/functions/parse_theme.html
deleted file mode 100644
index 59e9dfc..0000000
--- a/layouts/partials/functions/parse_theme.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{- $scr := .Scratch -}}
-{{ $skin := .Site.Data.skin }}
-
-{{- $scr.Set "custom_theme_primary_color" $skin.custom_theme_primary_color -}}
-{{- $scr.Set "chroma_theme" $skin.chroma_theme -}}
\ No newline at end of file
diff --git a/layouts/partials/script/single-script.html b/layouts/partials/script/single-script.html
index de89b13..250004a 100644
--- a/layouts/partials/script/single-script.html
+++ b/layouts/partials/script/single-script.html
@@ -29,44 +29,44 @@
 {{ end }}
 
 {{ if in .Params.Libraries "mermaid" }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"mermaid\"></script>" $js.mermaid.url $js.mermaid.sri | safeHTML }}
+  <script defer src="{{ $js.mermaid.url }}" integrity="{{ $js.mermaid.sri }}" crossorigin="anonymous" title="mermaid"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "katex" }}
-  {{ printf "<link rel=\"stylesheet\" href=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\">" $css.katex.url $css.katex.sri | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"katex\"></script>" $js.katex.url $js.katex.sri | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"katex\"></script>" $js.katex_auto_render.url $js.katex_auto_render.sri | safeHTML }}
+  <link rel="stylesheet" href="{{ $css.katex.url }}" integrity="{{$css.katex.sri }}" crossorigin="anonymous">
+  <script defer src="{{ $js.katex.url }}" integrity="{{ $js.katex.sri }}" crossorigin="anonymous" title="katex"></script>
+  <script defer src="{{ $js.katex_auto_render.url }}" integrity="{{ $js.katex_auto_render.sri }}" crossorigin="anonymous" title="katex"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "flowchartjs" }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"raphael\"></script>" $js.raphael.url $js.raphael.sri | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"flowchartjs\"></script>" $js.flowchartjs.url $js.flowchartjs.sri | safeHTML }}
+  <script defer src="{{ $js.raphael.url }}" integrity="{{ $js.raphael.sri }}" crossorigin="anonymous" title="raphael"></script>
+  <script defer src="{{ $js.flowchartjs.url }}" integrity="{{ $js.flowchartjs.sri }}" crossorigin="anonymous" title="flowchartjs"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "mathjax" }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"mathjax\"></script>" $js.mathjax.url $js.mathjax.sri | safeHTML }}
+  <script defer src="{{ $js.mathjax.url }}" integrity="{{ $js.mathjax.sri }}" crossorigin="anonymous" title="mathjax"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "msc" }}
-  {{ printf "<script defer src=\"%s\" crossorigin=\"anonymous\" title=\"webfont\"></script>" $js.webfont.url | safeHTML }}
-  {{ printf "<script defer src=\"%s\" crossorigin=\"anonymous\" title=\"snap_svg\"></script>" $js.snap_svg.url | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"lodash\"></script>" $js.lodash.url $js.lodash.sri | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"sequence_diagram\"></script>" $js.sequence_diagram.url $js.sequence_diagram.sri | safeHTML }}
-  {{ printf "<link rel=\"stylesheet\" href=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\">" $css.sequence_diagram.url $css.sequence_diagram.sri | safeHTML }}
+  <script defer src="{{ $js.webfont.url }}" crossorigin="anonymous" title="webfont"></script>
+  <script defer src="{{ $js.snap_svg.url }}" crossorigin="anonymous" title="snap_svg"></script>
+  <script defer src="{{ $js.lodash.url }}" integrity="{{ $js.lodash.sri }}" crossorigin="anonymous" title="lodash"></script>
+  <script defer src="{{ $js.sequence_diagram.url }}" integrity="{{ $js.sequence_diagram.sri }}" crossorigin="anonymous" title="sequence_diagram"></script>
+  <link rel="stylesheet" href="{{ $css.sequence_diagram.url }}" integrity="{{ $css.sequence_diagram.sri }}" crossorigin="anonymous">
 {{ end }}
 
 {{ if in .Params.Libraries "chart" }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"chart\"></script>" $js.chart.url $js.chart.sri | safeHTML }}
+  <script defer src="{{ $js.chart.url }}" integrity="{{ $js.chart.sri }}" crossorigin="anonymous" title="chart"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "wavedrom" }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"wavedrom\"></script>" $js.wavedrom.url $js.wavedrom.sri | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"wavedrom_skin\"></script>" $js.wavedrom_skin.url $js.wavedrom_skin.sri | safeHTML }}
+<script defer src="{{ $js.wavedrom.url }}" integrity="{{ $js.wavedrom.sri }}" crossorigin="anonymous" title="wavedrom"></script>
+<script defer src="{{ $js.wavedrom_skin.url }}" integrity="{{ $js.wavedrom_skin.sri }}" crossorigin="anonymous" title="wavedrom_skin"></script>
 {{ end }}
 
 {{ if in .Params.Libraries "viz" }}
-  {{ printf "<script defer src=\"%s\" crossorigin=\"anonymous\" title=\"viz\"></script>" $js.viz.url | safeHTML }}
-  {{ printf "<script defer src=\"%s\" integrity=\"%s\" crossorigin=\"anonymous\" title=\"viz_render\"></script>" $js.viz_render.url $js.viz_render.sri | safeHTML }}
+  <script defer src="{{ $js.viz.url }}" crossorigin="anonymous" title="viz"></script>
+  <script defer src="{{ $js.viz_render.url }}" integrity="{{ $js.viz_render.sri }}" crossorigin="anonymous" title="viz_render"></script>
 {{ end }}