From 5015fdecf36869ba7baeaac5ea1f42043092d8a0 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 25 Sep 2023 01:47:59 +0800 Subject: [PATCH] style(core): avoid using `<` or `>` within `capture` tag This interferes with the work of the editor Liquid-HTML plugin --- _includes/refactor-content.html | 85 ++++++++++++++++----------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/_includes/refactor-content.html b/_includes/refactor-content.html index 655ecd6..cd34d81 100644 --- a/_includes/refactor-content.html +++ b/_includes/refactor-content.html @@ -32,12 +32,10 @@ {% if _content contains '', - '' - | replace: - '', - '' + | replace: '', + '' + | replace: '', + '' %} {% endif %} @@ -45,7 +43,7 @@ {% assign IMG_TAG = ' @@ -81,10 +79,10 @@ {% assign _left = _left | remove: ' /' | replace: ' w=', ' width=' | replace: ' h=', ' height=' %} {% assign _attrs = _left | split: '" ' %} - {% assign _width = nil %} - {% assign _height = nil %} - {% assign _lqip = nil %} - {% assign _class = nil %} + {% assign _width = null %} + {% assign _height = null %} + {% assign _lqip = null %} + {% assign _class = null %} {% for _attr in _attrs %} {% unless _attr contains '=' %} @@ -115,7 +113,7 @@ {% assign _left = _left | remove: _old_class %} {% endif %} - {% assign _final_src = nil %} + {% assign _final_src = null %} {% unless _src contains '//' %} {% assign _final_src = _path_prefix | append: _src %} @@ -136,7 +134,7 @@ {% assign _left = _left | replace: 'src=', 'data-src=' %} {% if _left contains 'class=' %} - {% assign _left = _left | replace: 'class="', 'class="lazyload '%} + {% assign _left = _left | replace: 'class="', 'class="lazyload ' %} {% else %} {% assign _left = _left | append: ' class="lazyload"' %} {% endif %} @@ -150,7 +148,7 @@ {%- capture _svg -%} src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 {{ _width }} {{ _height }}'%3E%3C/svg%3E" {%- endcapture -%} - {% assign _left = _svg | append: ' ' | append: _left %} + {% assign _left = _svg | append: ' ' | append: _left %} {% assign _class = _class | append: ' shimmer' %} {% endif %} {% endif %} @@ -160,9 +158,8 @@ {% if page.layout == 'home' %} - {%- capture _wrapper_start -%} -
- {%- endcapture -%} + {% assign _wrapper_start = '
' %} + {% assign _img_content = _img_content | append: _wrapper_start %} {% assign _right = _right | prepend: '>' %} + {% assign _img_content = _img_content | slice: 0, _size | append: _class | append: '>' %} {% else %} - {%- capture _wrapper_start -%} - - {%- endcapture -%} + {% assign _wrapper_start = _final_src + | default: _src + | prepend: '' + %} + {% assign _img_content = _img_content | append: _wrapper_start %} {% assign _right = _right | prepend: '> {% assign _img_content = _img_content | append: debug | append: IMG_TAG | append: _left | append: _right %} - {% endfor %} {% if _img_content %} {% assign _content = _img_content %} {% endif %} - {% endif %} @@ -205,13 +205,11 @@ {% assign _new_content = '' %} {% for _snippet in _code_spippets %} - {% if forloop.last %} {% assign _new_content = _new_content | append: _snippet %} {% else %} - - {% assign _left = _snippet | split: '><' | last%} + {% assign _left = _snippet | split: '><' | last %} {% if _left contains 'file="' %} {% assign _label_text = _left | split: 'file="' | last | split: '"' | first %} @@ -226,21 +224,19 @@ {% endcapture %} - {% assign _new_content = _new_content | append: _snippet - | append: '
' - | append: _label - | append: '
' - | append: '
' + {% assign _new_content = _new_content + | append: _snippet + | append: '
' + | append: _label + | append: '
' + | append: '
' %} - {% endif %} - {% endfor %} {% assign _content = _new_content %} - {% endif %} @@ -249,11 +245,11 @@ {% assign _heading_content = _content %} {% for level in heading_levels %} - {% capture mark_start %}' %} {% if _heading_content contains mark_start %} - {% assign _new_content = nil %} + {% assign _new_content = null %} {% assign heading_snippets = _heading_content | split: mark_start %} {% for snippet in heading_snippets %} @@ -263,20 +259,19 @@ {% endif %} {% assign id = snippet | split: '"' | first %} - {% capture anchor %}{% endcapture %} + {% assign anchor = '' + %} {% assign left = snippet | split: mark_end | first %} {% assign right = snippet | slice: left.size, snippet.size %} {% assign left = left | replace_first: '">', '">' | append: '' %} - {% assign _new_content = _new_content | append: mark_start - | append: left | append: anchor | append: right - %} - + {% assign _new_content = _new_content | append: mark_start | append: left | append: anchor | append: right %} {% endfor %} {% assign _heading_content = _new_content %} - {% endif %} {% endfor %}