update: hasMedia and getMedia

2 files changed, 42 insertions, 6 deletions

diff --git a/ext/data/templates/anki-field-templates-upgrade-v21.handlebars b/ext/data/templates/anki-field-templates-upgrade-v21.handlebars
index 2fa0f0aa..0bfd95a5 100644
--- a/ext/data/templates/anki-field-templates-upgrade-v21.handlebars
+++ b/ext/data/templates/anki-field-templates-upgrade-v21.handlebars
@@ -35,6 +35,12 @@
 {{>>>>>>>}}
 
 {{<<<<<<<}}
+[sound:{{#getMedia "audio"}}{{/getMedia}}]
+{{=======}}
+[sound:{{getMedia "audio"}}]
+{{>>>>>>>}}
+
+{{<<<<<<<}}
 <span class="expression-{{termFrequency}}">{{~#furigana}}{{{.}}}{{/furigana~}}</span>
 {{=======}}
 <span class="expression-{{termFrequency}}">{{~furigana .~}}</span>
@@ -59,6 +65,24 @@
 {{>>>>>>>}}
 
 {{<<<<<<<}}
+<img src="{{#getMedia "screenshot"}}{{/getMedia}}" />
+{{=======}}
+<img src="{{getMedia "screenshot"}}" />
+{{>>>>>>>}}
+
+{{<<<<<<<}}
+<img src="{{#getMedia "clipboardImage"}}{{/getMedia}}" />
+{{=======}}
+<img src="{{getMedia "clipboardImage"}}" />
+{{>>>>>>>}}
+
+{{<<<<<<<}}
+{{~#if (hasMedia "clipboardText")}}{{#getMedia "clipboardText"}}{{/getMedia}}{{/if~}}
+{{=======}}
+{{~#if (hasMedia "clipboardText")}}{{getMedia "clipboardText"}}{{/if~}}
+{{>>>>>>>}}
+
+{{<<<<<<<}}
 {{~#furigana expression reading~}}{{~/furigana~}}
 {{=======}}
 {{~furigana expression reading~}}
@@ -107,3 +131,15 @@
                         {{~set (concat "used_" .) true~}}
                         {{~set "first" false~}}
 {{>>>>>>>}}
+
+{{<<<<<<<}}
+{{~#if (hasMedia "selectionText")}}{{#getMedia "selectionText"}}{{/getMedia}}{{/if~}}
+{{=======}}
+{{~#if (hasMedia "selectionText")}}{{getMedia "selectionText"}}{{/if~}}
+{{>>>>>>>}}
+
+{{<<<<<<<}}
+{{#getMedia "textFurigana" definition.cloze.sentence escape=false}}{{/getMedia}}
+{{=======}}
+{{getMedia "textFurigana" definition.cloze.sentence escape=false}}
+{{>>>>>>>}}
diff --git a/ext/data/templates/default-anki-field-templates.handlebars b/ext/data/templates/default-anki-field-templates.handlebars
index 69c7e7a1..08950f78 100644
--- a/ext/data/templates/default-anki-field-templates.handlebars
+++ b/ext/data/templates/default-anki-field-templates.handlebars
@@ -32,7 +32,7 @@
 
 {{#*inline "audio"}}
     {{~#if (hasMedia "audio")~}}
-        [sound:{{#getMedia "audio"}}{{/getMedia}}]
+        [sound:{{getMedia "audio"}}]
     {{~/if~}}
 {{/inline}}
 
@@ -174,7 +174,7 @@
 
 {{#*inline "screenshot"}}
     {{~#if (hasMedia "screenshot")~}}
-        <img src="{{#getMedia "screenshot"}}{{/getMedia}}" />
+        <img src="{{getMedia "screenshot"}}" />
     {{~/if~}}
 {{/inline}}
 
@@ -231,12 +231,12 @@
 
 {{#*inline "clipboard-image"}}
     {{~#if (hasMedia "clipboardImage")~}}
-        <img src="{{#getMedia "clipboardImage"}}{{/getMedia}}" />
+        <img src="{{getMedia "clipboardImage"}}" />
     {{~/if~}}
 {{/inline}}
 
 {{#*inline "clipboard-text"}}
-    {{~#if (hasMedia "clipboardText")}}{{#getMedia "clipboardText"}}{{/getMedia}}{{/if~}}
+    {{~#if (hasMedia "clipboardText")}}{{getMedia "clipboardText"}}{{/if~}}
 {{/inline}}
 
 {{#*inline "conjugation"}}
@@ -316,13 +316,13 @@
 {{/inline}}
 
 {{#*inline "selection-text"}}
-    {{~#if (hasMedia "selectionText")}}{{#getMedia "selectionText"}}{{/getMedia}}{{/if~}}
+    {{~#if (hasMedia "selectionText")}}{{getMedia "selectionText"}}{{/if~}}
 {{/inline}}
 
 {{#*inline "sentence-furigana"}}
     {{~#if definition.cloze~}}
         {{~#if (hasMedia "textFurigana" definition.cloze.sentence)~}}
-            {{#getMedia "textFurigana" definition.cloze.sentence escape=false}}{{/getMedia}}
+            {{getMedia "textFurigana" definition.cloze.sentence escape=false}}
         {{~else~}}
             {{definition.cloze.sentence}}
         {{~/if~}}