Skip to content

Commit 07d8647

Browse files
philwarehamphilwareham
committed
Revert "More DRY"
This reverts commit 49a7f28.
1 parent 49a7f28 commit 07d8647

File tree

2 files changed

+31
-19
lines changed

2 files changed

+31
-19
lines changed

‎src/templates/forms/misc/images.txp‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
11
<txp:evaluate test="image_info">
22
<figure itemprop="image" itemscope itemtype="https://schema.org/ImageObject">
3-
<txp:yield />
3+
<txp:smd_if_thumbnail type="article-832w">
4+
<txp:smd_thumbnail type="article-832w">
5+
<img loading="lazy" width="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />" height="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
6+
<meta itemprop="width" content="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />">
7+
<meta itemprop="height" content="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />">
8+
</txp:smd_thumbnail>
9+
<txp:else />
10+
<txp:if_yield name="dark-option">
11+
<img loading="lazy" class="prefers-color-scheme" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />" data-src-light="<txp:image_url />" data-src-dark="<txp:image_url id="<txp:yield name="dark-option" />" />">
12+
<txp:else />
13+
<img loading="lazy" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />">
14+
</txp:if_yield>
15+
<meta itemprop="width" content="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>">
16+
<meta itemprop="height" content="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>">
17+
</txp:smd_if_thumbnail>
418
<figcaption itemprop="caption">
519
<txp:image_info />
620
</figcaption>
721
</figure>
822
<txp:else />
923
<p itemprop="image" itemscope itemtype="https://schema.org/ImageObject">
10-
<txp:yield />
24+
<txp:smd_if_thumbnail type="article-832w">
25+
<txp:smd_thumbnail type="article-832w">
26+
<img loading="lazy" width="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />" height="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
27+
<meta itemprop="width" content="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />">
28+
<meta itemprop="height" content="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />">
29+
</txp:smd_thumbnail>
30+
<txp:else />
31+
<txp:if_yield name="dark-option">
32+
<img loading="lazy" class="prefers-color-scheme" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />" data-src-light="<txp:image_url />" data-src-dark="<txp:image_url id="<txp:yield name="dark-option" />" />">
33+
<txp:else />
34+
<img loading="lazy" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />">
35+
</txp:if_yield>
36+
<meta itemprop="width" content="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>">
37+
<meta itemprop="height" content="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>">
38+
</txp:smd_if_thumbnail>
1139
</p>
1240
</txp:evaluate>

‎src/templates/forms/shortcodes/media_image.txp‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
11
<txp:images id='<txp:yield name="id" />' break="">
2-
<txp:output_form form="images">
3-
<txp:smd_if_thumbnail type="article-832w">
4-
<txp:smd_thumbnail type="article-832w">
5-
<img loading="lazy" width="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />" height="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
6-
<meta itemprop="width" content="<txp:evaluate query='ceiling(<txp:image_info type="w" />div2)' />">
7-
<meta itemprop="height" content="<txp:evaluate query='ceiling(<txp:image_info type="h" />div2)' />">
8-
</txp:smd_thumbnail>
9-
<txp:else />
10-
<txp:if_yield name="dark-option">
11-
<img loading="lazy" class="prefers-color-scheme" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />" data-src-light="<txp:image_url />" data-src-dark="<txp:image_url id="<txp:yield name="dark-option" />" />">
12-
<txp:else />
13-
<img loading="lazy" width="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>" height="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>" itemprop="url contentUrl" alt="<txp:image_info type="alt" />" src="<txp:image_url />">
14-
</txp:if_yield>
15-
<meta itemprop="width" content="<txp:if_yield name="set-width"><txp:yield name="set-width" /><txp:else /><txp:image_info type="w" /></txp:if_yield>">
16-
<meta itemprop="height" content="<txp:if_yield name="set-height"><txp:yield name="set-height" /><txp:else /><txp:image_info type="h" /></txp:if_yield>">
17-
</txp:smd_if_thumbnail>
18-
</txp:output_form>
2+
<txp:output_form form="images" />
193
</txp:images>

0 commit comments

Comments
 (0)