fix(srcatch): fix srcatch bugs

assets/css/_core/_base.scss

@@ -75,3 +75,46 @@ a {
     }
   }
 }
+
+#dynamic-to-top {
+  display: none;
+  overflow: hidden;
+  width: auto;
+  z-index: 90;
+  position: fixed;
+  bottom: 2rem;
+  right: 2rem;
+  top: auto;
+  left: auto;
+  font-family: sans-serif;
+  font-size: 1rem;
+  color: #fff;
+  text-decoration: none;
+  font-weight: bold;
+  padding: 1rem 1rem;
+  border: 1px solid $global-border-color;
+  background: #222;
+  outline: none;
+  &:hover {
+    background: #000;
+    cursor: pointer;
+  }
+  &:active {
+    background: #000;
+    outline: none;
+  }
+  &:focus, &:hover {
+    outline: none;
+  }
+  span {
+    display: block;
+    overflow: hidden;
+    width: .875rem;
+    height: .75rem;
+    background: url('data:image/png;base64,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') no-repeat center center;
+  }
+
+  .dark-theme &{
+    border: 1px solid $global-border-color-dark;
+  }
+}

assets/css/_page/_single.scss

@@ -188,7 +188,7 @@
 
     img {
       display: block;
-      max-width: 90%;
+      max-width: 96%;
       height: auto;
       margin: 0 auto;
       overflow: hidden;

assets/css/_partial/_footer.scss

@@ -10,47 +10,3 @@
     }
   }
 }
-
-.dynamic-to-top {
-  display: none;
-  overflow: hidden;
-  width: auto;
-  z-index: 90;
-  position: fixed;
-  bottom: 2rem;
-  right: 2rem;
-  top: auto;
-  left: auto;
-  font-family: sans-serif;
-  font-size: 1rem;
-  color: #fff;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #333;
-  font-weight: bold;
-  padding: 1rem 1rem;
-  border: 1px solid $global-border-color;
-  background: #222;
-  &:hover {
-    background: #000;
-    cursor: pointer;
-  }
-  &:active {
-    background: #000;
-    outline: none;
-  }
-  outline: none;
-  &:focus, &:hover {
-    outline: none;
-  }
-  span {
-    display: block;
-    overflow: hidden;
-    width: .875rem;
-    height: .75rem;
-    background: url('data:image/png;base64,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') no-repeat center center;
-  }
-
-  .dark-theme &{
-    border: 1px solid $global-border-color-dark;
-  }
-}

assets/lib/mermaid/mermaid.scss

@@ -1,11 +1,15 @@
-.mermaid {
+.page .mermaid {
   width: 100%;
   margin: 3% auto;
   text-align: center;
 
+  & > svg {
+    max-width: 100%;
+  }
+
   @import "themes/neutral/index";
 
   .dark-theme & {
-    @import "themes/dark/index";
+    @import "themes/darker/index";
   }
 }

assets/lib/mermaid/themes/darker/index.scss

@@ -0,0 +1,62 @@
+$mainBkg: #BDD5EA;
+$secondBkg: #6D6D65;
+$mainContrastColor: lightgrey;
+$darkTextColor: #323D47;
+$lineColor: $mainContrastColor;
+$border1: #81B1DB;
+$border2: rgba(255, 255, 255, 0.25);
+$arrowheadColor: $mainContrastColor;
+
+/* Flowchart variables */
+
+$nodeBkg: $mainBkg;
+$nodeBorder: purple;
+$clusterBkg: $secondBkg;
+$clusterBorder: $border2;
+$defaultLinkColor: $lineColor;
+$titleColor: #F9FFFE;
+$edgeLabelBackground: #e8e8e8;
+
+/* Sequence Diagram variables */
+
+$actorBorder: $border1;
+$actorBkg: $mainBkg;
+$actorTextColor: black;
+$actorLineColor: $mainContrastColor;
+$signalColor: $mainContrastColor;
+$signalTextColor: $mainContrastColor;
+$labelBoxBkgColor: $actorBkg;
+$labelBoxBorderColor: $actorBorder;
+$labelTextColor: $darkTextColor;
+$loopTextColor: $mainContrastColor;
+$noteBorderColor: $border2;
+$noteBkgColor: #fff5ad;
+$activationBorderColor: #666;
+$activationBkgColor: #f4f4f4;
+$sequenceNumberColor: white;
+
+/* Gantt chart variables */
+
+$sectionBkgColor: rgba(255, 255, 255, 0.3);
+$altSectionBkgColor: white;
+$sectionBkgColor2: #EAE8B9;
+$taskBorderColor: rgba(255, 255, 255, 0.5);
+$taskBkgColor: $mainBkg;
+$taskTextColor: $darkTextColor;
+$taskTextLightColor: $mainContrastColor;
+$taskTextOutsideColor: $taskTextLightColor;
+$taskTextClickableColor: #003163;
+$activeTaskBorderColor: rgba(255, 255, 255, 0.5);
+$activeTaskBkgColor: #81B1DB;
+$gridColor: $mainContrastColor;
+$doneTaskBkgColor: $mainContrastColor;
+$doneTaskBorderColor: grey;
+$critBorderColor: #E83737;
+$critBkgColor: #E83737;
+$taskTextDarkColor: $darkTextColor;
+$todayLineColor: #DB5757;
+
+/* state colors */
+$labelColor: black;
+
+@import '../mermaid';

exampleSite/content/posts/Basic-Markdown-Preview.zh.md

@@ -289,11 +289,11 @@ func main() {
 ### 4.5 表格
 
 ```markdown
-| _颜色_      | 水果          | 蔬菜         |
+| _颜色_      | 水果           | 蔬菜          |
-| ----------  |:---------------:| -----------:|
+| ----------- |:-------------:| ----------  -:|
-| 红色           | *苹果*         | 辣椒      |
+| 红色        | *苹果*         | 辣椒          |
-| ~~橙色~~    | 橘子         | **胡萝卜**        |
+| ~~橙色~~    | 橘子           | **胡萝卜**    |
-| 绿色         | ~~***梨子***~~ | 菠菜           |
+| 绿色        | ~~***梨子***~~ | 菠菜          |
 ```
 
 | _颜色_      | 水果          | 蔬菜         |

exampleSite/content/posts/rich-content.en.md

@@ -27,9 +27,9 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 
 ---
 
-## Instagram Simple Shortcode
+## Instagram Shortcode
 
-{{< instagram_simple BGvuInzyFAe hidecaption >}}
+{{< instagram BGvuInzyFAe hidecaption >}}
 
 <br>
 
@@ -43,9 +43,9 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 
 ---
 
-## Twitter Simple Shortcode
+## Twitter Shortcode
 
-{{< twitter_simple 1085870671291310081 >}}
+{{< twitter 1085870671291310081 >}}
 
 <br>
 

exampleSite/content/posts/test-mermaid.zh.md

@@ -0,0 +1,105 @@
+---
+title: "Test Mermaid"
+date: 2020-02-27T15:41:42+08:00
+lastmod: 2020-02-27T15:41:42+08:00
+draft: true
+author: ""
+authorLink: ""
+description: ""
+license: ""
+
+tags: []
+categories: []
+hiddenFromHomePage: false
+
+featuredImage: ""
+featuredImagePreview: ""
+
+toc: false
+autoCollapseToc: true
+lightgallery: true
+math: false
+comment: true
+---
+
+<!--more-->
+
+## Flow
+
+{{< mermaid >}}
+graph TD
+A[Hard] -->|Text| B(Round)
+B --> C{Decision}
+C -->|One| D[Result 1]
+C -->|Two| E[Result 2]
+{{< /mermaid >}}
+
+## Sequence
+
+{{< mermaid >}}
+sequenceDiagram
+Alice->>John: Hello John, how are you?
+loop Healthcheck
+    John->>John: Fight against hypochondria
+end
+Note right of John: Rational thoughts!
+John-->>Alice: Great!
+John->>Bob: How about you?
+Bob-->>John: Jolly good!
+{{< /mermaid >}}
+
+## Gantt
+
+{{< mermaid >}}
+gantt
+    title A Gantt Diagram
+    dateFormat  YYYY-MM-DD
+    section Section
+    A task           :a1, 2014-01-01, 30d
+    Another task     :after a1  , 20d
+    section Another
+    Task in sec      :2014-01-12  , 12d
+    another task      : 24d
+{{< /mermaid >}}
+
+## Class
+
+{{< mermaid >}}
+classDiagram
+Class01 <|-- AveryLongClass : Cool
+<<interface>> Class01
+Class09 --> C2 : Where am i?
+Class09 --* C3
+Class09 --|> Class07
+Class07 : equals()
+Class07 : Object[] elementData
+Class01 : size()
+Class01 : int chimp
+Class01 : int gorilla
+class Class10 {
+  <<service>>
+  int id
+  size()
+}
+{{< /mermaid >}}
+
+## State
+
+{{< mermaid >}}
+stateDiagram
+[*] --> Still
+Still --> [*]
+Still --> Moving
+Moving --> Still
+Moving --> Crash
+Crash --> [*]
+{{< /mermaid >}}
+
+## Pie
+
+{{< mermaid >}}
+pie
+"Dogs" : 386
+"Cats" : 85
+"Rats" : 15
+{{< /mermaid >}}

exampleSite/content/posts/test.zh.md

@@ -20,10 +20,9 @@ autoCollapseToc: true
 lightgallery: true
 math: true
 comment: false
-dev: true
 ---
 
-## & :(fas fa-rocket): This is a test page
+## :(fas fa-rocket): This is a test page
 
 [https://www.aol.com/article/entertainment/2020/02/10/oscars-viewership-hits-new-low-with-236-million-viewers/23923047/](https://www.aol.com/article/entertainment/2020/02/10/oscars-viewership-hits-new-low-with-236-million-viewers/23923047/)
 
@@ -131,44 +130,47 @@ _Blog.chroma = function () {
 
 ## Test ECharts
 
-{{< dev/echarts >}}
+{{< echarts >}}
-title : {
+title:
-    text: '某站点用户访问来源',
+  text: 某站点用户访问来源
-    subtext: '纯属虚构',
+  subtext: 纯属虚构
-    x:'center'
+  x: center
-},
+tooltip:
-tooltip : {
+  trigger: item
-    trigger: 'item',
+  formatter: '{a} <br/>{b} : {c} ({d}%)'
-    formatter: "{a} <br/>{b} : {c} ({d}%)"
+legend:
-},
+  orient: vertical
-legend: {
+  left: left
-    orient: 'vertical',
+  data:
-    left: 'left',
+    - 直接访问
-    data: ['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
+    - 邮件营销
-},
+    - 联盟广告
-series : [
+    - 视频广告
-    {
+    - 搜索引擎
-        name: '访问来源',
+series:
-        type: 'pie',
+  - name: 访问来源
-        radius : '55%',
+    type: pie
-        center: ['50%', '60%'],
+    radius: 55%
-        data:[
+    center:
-            {value:335, name:'直接访问'},
+      - 50%
-            {value:310, name:'邮件营销'},
+      - 60%
-            {value:234, name:'联盟广告'},
+    data:
-            {value:135, name:'视频广告'},
+      - value: 335
-            {value:1548, name:'搜索引擎'}
+        name: 直接访问
-        ],
+      - value: 310
-        itemStyle: {
+        name: 邮件营销
-            emphasis: {
+      - value: 234
-                shadowBlur: 10,
+        name: 联盟广告
-                shadowOffsetX: 0,
+      - value: 135
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
+        name: 视频广告
-            }
+      - value: 1548
-        }
+        name: 搜索引擎
-    }
+    itemStyle:
-]
+      emphasis:
-{{< /dev/echarts >}}
+        shadowBlur: 10
+        shadowOffsetX: 0
+        shadowColor: 'rgba(0, 0, 0, 0.5)'
+{{< /echarts >}}
 
 ## Test Mermaid
 

layouts/_default/_markup/render-image.html

@@ -1,6 +1,6 @@
 <figure>
     {{- $lightgallery := ne .Page.Site.Params.page.lightgallery false | and (ne .Page.Params.lightgallery false) -}}
-    {{- partial "plugin/image.html" (dict "src" .Destination "title" .Title "description" .Text "lightgallery" $lightgallery "context" .Page) -}}
+    {{- partial "plugin/image.html" (dict "src" .Destination "title" .Title "description" .Text "lightgallery" $lightgallery "scratch" (.Page.Scratch.Get "scratch")) -}}
     {{- with (.Title | default .Text) -}}
         <figcaption class="image-caption">
             {{- . | safeHTML -}}

layouts/_default/baseof.html

@@ -58,7 +58,7 @@
             <span>&nbsp;</span>
         </a>
 
-        {{- /* Load script */ -}}
+        {{- /* Load JavaScript scripts and CSS */ -}}
-        {{- partial "script.html" . -}}
+        {{- partial "assets.html" . -}}
     </body>
 </html>

layouts/_default/summary.html

@@ -1,9 +1,11 @@
+{{- $scratch := .Scratch.Get "scratch" -}}
+
 <article class="single summary" itemscope itemtype="http://schema.org/Article">
     {{- /* Featured image */ -}}
     {{- with .Params.featuredImage -}}
         <div class="featured-image-preview">
             {{- $image := $.Params.featuredImagePreview | default . -}}
-            {{- partial "plugin/image.html" (dict "src" $image "description" $.Description "context" $) -}}
+            {{- partial "plugin/image.html" (dict "src" $image "description" $.Description "scratch" $scratch) -}}
         </div>
     {{- end -}}
 

layouts/partials/assets.html

@@ -146,7 +146,7 @@
 {{- end -}}
 
 {{- /* mermaid */ -}}
-{{- with $scratch.Get "mermaidMap" -}}
+{{- with $scratch.Get "mermaidArr" -}}
     {{- with $CDN.mermaidJS -}}
         {{- slice . | $scratch.Add "scriptCDN" -}}
     {{- else -}}
@@ -154,7 +154,24 @@
     {{- end -}}
     {{- slice "lib/mermaid/mermaid.scss" | $scratch.Add "linkLocal" -}}
     <script>
-        window.mermaidMap = {{ jsonify . | safeJS }};
+        window.mermaidArr = {{ jsonify . | safeJS }};
+    </script>
+{{- end -}}
+
+{{- /* ECharts */ -}}
+{{- with $scratch.Get "echartsArr" -}}
+    {{- with $CDN.echartsJS -}}
+        {{- slice . | $scratch.Add "scriptCDN" -}}
+    {{- else -}}
+        {{- slice "lib/echarts/echarts.min.js" | $scratch.Add "scriptLocal" -}}
+    {{- end -}}
+    {{- with $CDN.echartsMacaronsJS -}}
+        {{- slice . | $scratch.Add "scriptCDN" -}}
+    {{- else -}}
+        {{- slice "lib/echarts/macarons.js" | $scratch.Add "scriptLocal" -}}
+    {{- end -}}
+    <script>
+        window.echartsArr = {{ jsonify . | safeJS }};
     </script>
 {{- end -}}
 
@@ -181,28 +198,14 @@
     {{- end -}}
 {{- end -}}
 
-{{- /* dev feature */ -}}
+{{- /* Dev feature */ -}}
 {{- if .Params.dev -}}
-    {{- /* ECharts */ -}}
+{{- end -}}
-    {{- with $scratch.Get "echartsMap" -}}
+
-        {{- with $CDN.echartsJS -}}
+{{- with $scratch.Get "contentMap" -}}
-            {{- slice . | $scratch.Add "scriptCDN" -}}
+    <script>
-        {{- else -}}
+        window.contentMap = {{ jsonify . | safeJS }};
-            {{- slice "lib/echarts/echarts.min.js" | $scratch.Add "scriptLocal" -}}
+    </script>
-        {{- end -}}
-        {{- with $CDN.echartsMacaronsJS -}}
-            {{- slice . | $scratch.Add "scriptCDN" -}}
-        {{- else -}}
-            {{- slice "lib/echarts/macarons.js" | $scratch.Add "scriptLocal" -}}
-        {{- end -}}
-        <script>
-            window.echartsMap = {
-                {{- range $key, $var := . -}}
-                    {{- $key }}: {{ $var | safeJS -}},
-                {{- end -}}
-            };
-        </script>
-    {{- end -}}
 {{- end -}}
 
 {{- /* Theme script */ -}}

layouts/partials/function/id.html

@@ -0,0 +1,6 @@
+{{- /* ID */ -}}
+{{- /* Content -> unique ID */ -}}
+{{- /* shuffle md5 as id */ -}}
+{{- $id := delimit (split (md5 now.Unix) "" | shuffle | first 6) "" | printf "id-%s" -}}
+{{- .scratch.SetInMap "contentMap" $id .content -}}
+{{- return $id -}}

layouts/partials/home/profile.html

@@ -8,7 +8,7 @@
     {{- with $avatar -}}
         <div class="home-avatar">
             <a href="/posts">
-                {{- partial "plugin/image.html" (dict "src-s" . "title" "avatar" "description" (T "home") "context" $) -}}
+                {{- partial "plugin/image.html" (dict "src_s" . "title" "avatar" "description" (T "home") "scratch" $scratch) -}}
             </a>
         </div>
     {{- end -}}
@@ -16,11 +16,8 @@
     {{- with .Site.Params.home.profile.subtitle -}}
         <h2 class="home-description">
             {{- if $.Site.Params.home.profile.typeit -}}
-                {{- $id := md5 . | printf "tp-%s" -}}
+                {{- $id := partial "function/id.html" (dict "content" . "scratch" $scratch) -}}
-                <div id={{ printf "r%s" $id }} hidden=true>
+                <div id="{{ $id }}" class="typeit"></div>
-                    {{- . -}}
-                </div>
-                <div id={{ $id }} class="typeit"></div>
                 {{- $scratch.SetInMap "typeitMap" $id (slice $id) -}}
             {{- else -}}
                 {{- . -}}

layouts/partials/plugin/icon.html

@@ -1,6 +1,5 @@
-{{- $type := index . "type" | default "fa" -}}
+{{- $type := .type | default "fa" -}}
-{{- $classList := split (index . "class") " " -}}
+{{- $classList := split .class " " -}}
-{{- $context := index . "context" -}}
 {{- /* Fork Awesome */ -}}
 {{- if eq $type "fo" -}}
     {{- $newClassList := slice -}}
@@ -12,13 +11,11 @@
         {{- end -}}
     {{- end -}}
     {{- $classList = $newClassList -}}
-    {{- $scratch := $context.Scratch.Get "scratch" -}}
+    {{- .scratch.Set "forkawesome" true -}}
-    {{- $scratch.Set "forkawesome" true -}}
 
 {{- /* default is Font Awesome */ -}}
 {{- /* Others */ -}}
 {{- else if ne $type "fa" -}}
-    {{- $scratch := $context.Scratch.Get "scratch" -}}
+    {{- .scratch.Set "iconfont" true -}}
-    {{- $scratch.Set "iconfont" true -}}
 {{- end -}}
 <i class="{{ delimit $classList ` ` }}"></i>

layouts/partials/plugin/image.html

@@ -1,34 +1,29 @@
 {{- /* lazysizes and lightgallery.js */ -}}
-{{- $src := index . "src" -}}
+{{- $small := .src_s | default .src -}}
-{{- $small := index . "src-s" | default $src -}}
+{{- $large := .src_l | default .src -}}
-{{- $large := index . "src-l" | default $src -}}
-{{- $title := index . "title" -}}
-{{- $description := index . "description" -}}
-{{- $context := index . "context" -}}
-{{- $scratch := $context.Scratch.Get "scratch" -}}
 {{- $loading := resources.Get "svg/loading.svg" | minify -}}
-{{- if not (index . "src") | and (index . "src-s") -}}
+{{- if not .src | and .src_s -}}
     {{- $loading = resources.Get "svg/loading.small.svg" | minify -}}
 {{- end -}}
-{{- if index . "lightgallery" -}}
+{{- if .lightgallery -}}
-    <a class="lightgallery" href="{{ $large | safeURL }}" title="{{ $description }}" data-thumbnail="{{ $small | safeURL }}"{{ if $title }} data-sub-html="<h2>{{ $title }}</h2><p>{{ $description }}</p>"{{ end }}>
+    <a class="lightgallery" href="{{ $large | safeURL }}" title="{{ .description }}" data-thumbnail="{{ $small | safeURL }}"{{ if .title }} data-sub-html="<h2>{{ .title }}</h2><p>{{ .description }}</p>"{{ end }}>
         <img
             class="lazyload"
             src="{{ $loading.RelPermalink | safeURL }}"
             data-sizes="auto"
-            data-srcset="{{ $small | safeURL }}, {{ $src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
+            data-srcset="{{ $small | safeURL }}, {{ .src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
-            data-src="{{ $src | safeURL }}"
+            data-src="{{ .src | safeURL }}"
-            alt="{{ $title | default $description }}" />
+            alt="{{ .title | default .description }}" />
     </a>
-    {{- $scratch.Set "lightgallery" true -}}
+    {{- .scratch.Set "lightgallery" true -}}
 {{- else -}}
     <img
         class="lazyload"
         src="{{ $loading.RelPermalink | safeURL }}"
         data-sizes="auto"
-        data-srcset="{{ $small | safeURL }}, {{ $src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
+        data-srcset="{{ $small | safeURL }}, {{ .src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
-        data-src="{{ $src | safeURL }}"
+        data-src="{{ .src | safeURL }}"
-        alt="{{ $title | default $description }}"
+        alt="{{ .title | default .description }}"
-        title="{{ $description }}" />
+        title="{{ .description }}" />
 {{- end -}}
-{{- $scratch.Set "lazysizes" true -}}
+{{- .scratch.Set "lazysizes" true -}}

layouts/partials/plugin/link.html

@@ -1,9 +1,8 @@
-{{- $href := index . "href" -}}
+<a href="{{ .href | safeURL }}"{{ with .title }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .href "http" }} target="_blank"{{ end }} rel="noopener noreffer{{ with .rel }} {{ . }}{{ end }}">
-<a href="{{ $href | safeURL }}"{{ with index . "title" }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix $href "http" }} target="_blank"{{ end }} rel="noopener noreffer{{ with index . `rel` }} {{ . }}{{ end }}">
+    {{- with .icon -}}
-    {{- with index . "icon" -}}
         {{- partial "plugin/icon.html" . -}}
     {{- end -}}
-    {{- with index . "content" -}}
+    {{- with .content -}}
         {{- . | safeHTML -}}
     {{- end -}}
 </a>

layouts/partials/plugin/share.html

@@ -97,7 +97,7 @@
     {{- /* 014: Instapaper */ -}}
     {{- if .Params.Share.Instapaper | default .Site.Params.Share.Instapaper | eq true -}}
         <a href="javascript:void(0);" title="{{ T `share` }} Instapaper" data-sharer="instapaper" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
-            {{- partial "plugin/icon.html" (dict "class" "loveit it-instapaper-fill" "type" "other" "context" .) -}}
+            {{- partial "plugin/icon.html" (dict "class" "loveit it-instapaper-fill" "type" "other" "scratch" $scratch) -}}
         </a>
     {{- end -}}
 
@@ -146,7 +146,7 @@
     {{- /* 021: Myspace */ -}}
     {{- if .Params.Share.Myspace | default .Site.Params.Share.Myspace | eq true -}}
         <a href="javascript:void(0);" title="{{ T `share` }} Myspace" data-sharer="myspace" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
-            {{- partial "plugin/icon.html" (dict "class" "loveit it-myspace-fill" "type" "other" "context" .) -}}
+            {{- partial "plugin/icon.html" (dict "class" "loveit it-myspace-fill" "type" "other" "scratch" $scratch) -}}
         </a>
     {{- end -}}
 
@@ -160,7 +160,7 @@
     {{- /* 023: 百度 */ -}}
     {{- if .Params.Share.Baidu | default .Site.Params.Share.Baidu | eq true -}}
         <a href="javascript:void(0);" title="{{ T `share` }} 百度" data-sharer="baidu" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- partial "plugin/icon.html" (dict "class" "loveit it-baidu-fill" "type" "other" "context" .) -}}
+            {{- partial "plugin/icon.html" (dict "class" "loveit it-baidu-fill" "type" "other" "scratch" $scratch) -}}
         </a>
     {{- end -}}
 

layouts/partials/plugin/social.html

@@ -1,3 +1,5 @@
+{{- $scratch := .Scratch.Get "scratch" -}}
+
 {{- /* 001: Github */ -}}
 {{- with .Site.Params.Social.Github -}}
     {{- $options := dict "href" (printf "https://github.com/%s" .) "title" "GitHub" "rel" "me" -}}
@@ -302,7 +304,7 @@
 {{- /* 044: 知乎 */ -}}
 {{- with .Site.Params.Social.Zhihu -}}
     {{- $options := dict "href" (printf "https://www.zhihu.com/people/%s" .) "title" "知乎" "rel" "me" -}}
-    {{- $options = dict "icon" (dict "class" "loveit it-zhihu-line" "type" "other" "context" $) | merge $options -}}
+    {{- $options = dict "icon" (dict "class" "loveit it-zhihu-line" "type" "other" "scratch" $scratch) | merge $options -}}
     {{- partial "plugin/link.html" $options -}}
 {{- end -}}
 
@@ -394,28 +396,28 @@
 {{- /* 055: Gitea */ -}}
 {{- with .Site.Params.Social.Gitea -}}
     {{- $options := dict "href" . "title" "Gitea" "rel" "me" -}}
-    {{- $options = dict "icon" (dict "class" "fa fa-gitea fa-fw" "type" "fo" "context" $) | merge $options -}}
+    {{- $options = dict "icon" (dict "class" "fa fa-gitea fa-fw" "type" "fo" "scratch" $scratch) | merge $options -}}
     {{- partial "plugin/link.html" $options -}}
 {{- end -}}
 
 {{- /* 056: XMPP */ -}}
 {{- with .Site.Params.Social.XMPP -}}
     {{- $options := dict "href" (printf "xmpp:%s" .) "title" "XMPP" "rel" "me" -}}
-    {{- $options = dict "icon" (dict "class" "fa fa-xmpp fa-fw" "type" "fo" "context" $) | merge $options -}}
+    {{- $options = dict "icon" (dict "class" "fa fa-xmpp fa-fw" "type" "fo" "scratch" $scratch) | merge $options -}}
     {{- partial "plugin/link.html" $options -}}
 {{- end -}}
 
 {{- /* 057: Matrix */ -}}
 {{- with .Site.Params.Social.Matrix -}}
     {{- $options := dict "href" (printf "https://matrix.to/#/%s" .) "title" "Matrix" "rel" "me" -}}
-    {{- $options = dict "icon" (dict "class" "fa fa-matrix-org fa-fw" "type" "fo" "context" $) | merge $options -}}
+    {{- $options = dict "icon" (dict "class" "fa fa-matrix-org fa-fw" "type" "fo" "scratch" $scratch) | merge $options -}}
     {{- partial "plugin/link.html" $options -}}
 {{- end -}}
 
 {{- /* 058: bilibili */ -}}
 {{- with .Site.Params.Social.Bilibili -}}
     {{- $options := dict "href" (printf "https://space.bilibili.com/%s" .) "title" "bilibili" "rel" "me" -}}
-    {{- $options = dict "icon" (dict "class" "loveit it-bilibili-fill" "type" "other" "context" $) | merge $options -}}
+    {{- $options = dict "icon" (dict "class" "loveit it-bilibili-fill" "type" "other" "scratch" $scratch) | merge $options -}}
     {{- partial "plugin/link.html" $options -}}
 {{- end -}}
 

layouts/posts/single.html

@@ -47,7 +47,7 @@
         {{- /* Featured image */ -}}
         {{- with .Params.featuredImage -}}
             <div class="featured-image">
-                {{- partial "plugin/image.html" (dict "src" . "description" $.Description "context" $) -}}
+                {{- partial "plugin/image.html" (dict "src" . "description" $.Description "scratch" $scratch) -}}
             </div>
         {{- end -}}
 

layouts/shortcodes/dev/echarts.html

@@ -1,6 +0,0 @@
-{{- $scratch := .Page.Scratch.Get "scratch" -}}
-
-{{- /* shuffle md5 as id */ -}}
-{{- $id := delimit (split (md5 .Inner) "" | shuffle) "" | printf "echarts-%s" -}}
-<div class="echarts" id="{{ $id }}"></div>
-{{- $scratch.SetInMap "echartsMap" $id (printf "{%s}" .Inner) -}}

layouts/shortcodes/echarts.html

@@ -0,0 +1,6 @@
+{{- $scratch := .Page.Scratch.Get "scratch" -}}
+
+{{- $content := .Inner | transform.Unmarshal | jsonify -}}
+{{- $id := partial "function/id.html" (dict "content" $content "scratch" $scratch) -}}
+<div class="echarts" id="{{ $id }}"></div>
+{{- slice $id | $scratch.Add "echartsArr" -}}

layouts/shortcodes/mermaid.html

@@ -1,6 +1,5 @@
 {{- $scratch := .Page.Scratch.Get "scratch" -}}
 
-{{- /* shuffle md5 as id */ -}}
+{{- $id := partial "function/id.html" (dict "content" (trim .Inner "\n") "scratch" $scratch) -}}
-{{- $id := delimit (split (md5 .Inner) "" | shuffle) "" | printf "mermaid-%s" -}}
 <div class="mermaid" id="{{ $id }}"></div>
-{{- $scratch.SetInMap "mermaidMap" $id (trim .Inner "\n") -}}
+{{- slice $id | $scratch.Add "mermaidArr" -}}

layouts/shortcodes/typeit.html

@@ -1,16 +1,12 @@
 {{- $scratch := .Page.Scratch.Get "scratch" -}}
 
 {{- /* only the trailing newline is retained */ -}}
-{{- $content := replaceRE `(?s)^\n*(.*?)\n*$` "$1\n" .Inner | .Page.RenderString -}}
+{{- $content := replaceRE `(?s)^\n*(.*?)\n*$` "$1\n" .Inner | .Page.RenderString | chomp -}}
-{{- /* shuffle md5 as id */ -}}
+{{- $id := partial "function/id.html" (dict "content" $content "scratch" $scratch) -}}
-{{- $id := delimit (split (md5 $content) "" | shuffle) "" | printf "typeit-%s" -}}
 
 <div class={{ .Get "class" | default "typeit" }}>
     {{- /* raw html content */ -}}
     {{- if .Get "raw" -}}
-        <div id={{ printf "r%s" $id }} hidden=true>
-            {{- $content | safeHTML -}}
-        </div>
         <div id={{ $id }}></div>
     {{- else if .Get "code" -}}
         {{- /* highlight code content without line number */ -}}
@@ -23,16 +19,9 @@
         {{- $content = replaceRE ` ` "&nbsp;" $content | replaceRE `(<\w+)&nbsp;` "$1 " | replaceRE `\n` "<br />" -}}
         {{- /* fix "<br />" location error which is a bug of Typeit HTML parser */ -}}
         {{- $content = replaceRE `<br /></span>` "</span><br />" $content -}}
-        <div id={{ printf "r%s" $id }} hidden=true>
-            {{- $content | safeHTML -}}
-        </div>
         <div class="highlight" id={{ $id }}></div>
     {{- else -}}
         {{- $tag := .Get "tag" | default "p" -}}
-        {{- $content = $content | chomp -}}
-        <div id={{ printf "r%s" $id }} hidden=true>
-            {{- $content | safeHTML -}}
-        </div>
         {{- printf "<%s id=%s></%s>" $tag $id $tag | safeHTML -}}
     {{- end -}}
 

resources/_gen/assets/scss/css/style.template.scss_40942e46c3aa444eabf479d066570690.json

@@ -1 +1 @@
-{"Target":"css/style.min.0c871a59eda3563babe70ccf804244063ca3f833552e8ca99ccd9c802d6d67f0.css","MediaType":"text/css","Data":{"Integrity":"sha256-DIcaWe2jVjur5wzPgEJEBjyj+DNVLoypnM2cgC1tZ/A="}}
+{"Target":"css/style.min.5313a7cd528e285a82280f60228e0e2501181a5445bde1bc99d7c7dbdb7a4767.css","MediaType":"text/css","Data":{"Integrity":"sha256-UxOnzVKOKFqCKA9gIo4OJQEYGlRFveG8mdfH29t6R2c="}}

resources/_gen/assets/scss/lib/mermaid/mermaid.scss_6a9b89851c76ccc96568016ff9eba049.json

@@ -1 +1 @@
-{"Target":"lib/mermaid/mermaid.6094c0b431ca63173ab925fcceb838ae3b251b0b0fc0d3974c6ae78ae3c0bc2d.css","MediaType":"text/css","Data":{"Integrity":"sha256-YJTAtDHKYxc6uSX8zrg4rjslGwsPwNOXTGrniuPAvC0="}}
+{"Target":"lib/mermaid/mermaid.828bd139deac55c048b4d9ed77d849196aada4a0ea2268d7c59946e8d71665b7.css","MediaType":"text/css","Data":{"Integrity":"sha256-govROd6sVcBItNntd9hJGWqtpKDqImjXxZlG6NcWZbc="}}

src/js/theme.js

@@ -171,29 +171,27 @@
         }
 
         initMermaid() {
-            if (window.mermaidMap) {
+            if (window.mermaidArr) {
-                mermaid.initialize({startOnLoad: false, theme: null});
+                mermaid.initialize({startOnLoad: false, theme: 'null'});
-                Object.keys(window.mermaidMap).forEach((id) => {
+                this.util.forEach(window.mermaidArr, (id) => {
                     const element = document.getElementById(id);
-                    mermaid.mermaidAPI.render("d" + id, window.mermaidMap[id], (svgCode) => {
+                    mermaid.mermaidAPI.render('svg-' + id, window.contentMap[id], (svgCode) => {
                         element.innerHTML = svgCode;
-                        const svg = element.firstChild;
-                        svg.style.width = "100%"
                     }, element);
                 });
             }
         }
 
         initEcharts() {
-            if (window.echartsMap) {
+            if (window.echartsArr) {
                 this._echartsArr = this._echartsArr || [];
                 for (let i = 0; i < this._echartsArr.length; i++) {
                     this._echartsArr[i].dispose();
                 }
                 this._echartsArr = [];
-                Object.keys(window.echartsMap).forEach((id) => {
+                this.util.forEach(window.echartsArr, (id) => {
                     const chart = echarts.init(document.getElementById(id), window.isDark ? 'dark' : 'macarons', {renderer: 'svg'});
-                    chart.setOption(window.echartsMap[id]);
+                    chart.setOption(JSON.parse(window.contentMap[id]));
                     this._echartsArr.push(chart);
                 });
                 this._echartsOnResize = this._echartsOnResize || (() => {
@@ -210,15 +208,15 @@
                 for (let i = 0; i < window.typeitArr.length; i++) {
                     const group = window.typeitArr[i];
                     (function typeone(i) {
-                        const content = document.getElementById(`r${group[i]}`).innerHTML;
+                        const id = group[i];
                         if (i === group.length - 1) {
-                            new TypeIt(`#${group[i]}`, {
+                            new TypeIt(`#${id}`, {
-                                strings: content,
+                                strings: window.contentMap[id],
                             }).go();
                             return;
                         }
-                        let instance = new TypeIt(`#${group[i]}`, {
+                        let instance = new TypeIt(`#${id}`, {
-                            strings: content,
+                            strings: window.contentMap[id],
                             afterComplete: () => {
                                 instance.destroy();
                                 typeone(i + 1);
@@ -291,6 +289,7 @@
                         this.initMenuMobile();
                         this.initToc();
                         this.initSmoothScroll();
+                        this.initMermaid()
                     }, 100);
                 }
             }, false);