From 2bfc7e39725420a2a1a89d968b0a1f27687f70ea Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 11 Oct 2019 17:56:17 -0400
Subject: [PATCH] Fix order of {screenshot} tag

---
 README.md               | 4 ++--
 ext/bg/js/dictionary.js | 4 ++--
 ext/bg/js/settings.js   | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b05a050e..01c890cb 100644
--- a/README.md
+++ b/README.md
@@ -162,10 +162,10 @@ Flashcard fields can be configured with the following steps:
     `{furigana-plain}` | Term expressed as Kanji with Furigana displayed next to it in brackets (e.g. 日本語[にほんご]).
     `{glossary}` | List of definitions for the term (output format depends on whether running in *grouped* mode).
     `{reading}` | Kana reading for the term (empty for terms where the expression is the reading).
+    `{screenshot}` | Screenshot of the web page taken at the time the term was added.
     `{sentence}` | Sentence, quote, or phrase in which the term appears in the source content.
     `{tags}` | Grammar and usage tags providing information about the term (unavailable in *grouped* mode).
     `{url}` | Address of the web page in which the term appeared in.
-    `{screenshot}` | Screenshot of the web page taken at the time the term was added.
 
     #### Markers for Kanji Cards ####
 
@@ -179,9 +179,9 @@ Flashcard fields can be configured with the following steps:
     `{glossary}` | List of definitions for the Kanji.
     `{kunyomi}` | Kunyomi (Japanese reading) for the Kanji expressed as Katakana.
     `{onyomi}` | Onyomi (Chinese reading) for the Kanji expressed as Hiragana.
+    `{screenshot}` | Screenshot of the web page taken at the time the Kanji was added.
     `{sentence}` | Sentence, quote, or phrase in which the character appears in the source content.
     `{url}` | Address of the web page in which the Kanji appeared in.
-    `{screenshot}` | Screenshot of the web page taken at the time the Kanji was added.
 
 When creating your model for Yomichan, *please make sure that you pick a unique field to be first*; fields that will
 contain `{expression}` or `{character}` are ideal candidates for this. Anki does not require duplicate flashcards to be
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 498eafcd..191058c1 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -342,10 +342,10 @@ async function dictFieldFormat(field, definition, mode, options) {
         'kunyomi',
         'onyomi',
         'reading',
+        'screenshot',
         'sentence',
         'tags',
-        'url',
-        'screenshot'
+        'url'
     ];
 
     for (const marker of markers) {
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index f3b5ff16..84b54ba9 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -607,10 +607,10 @@ async function ankiFieldsPopulate(element, options) {
             'glossary',
             'glossary-brief',
             'reading',
+            'screenshot',
             'sentence',
             'tags',
-            'url',
-            'screenshot'
+            'url'
         ],
         'kanji': [
             'character',
@@ -618,6 +618,7 @@ async function ankiFieldsPopulate(element, options) {
             'glossary',
             'kunyomi',
             'onyomi',
+            'screenshot',
             'sentence',
             'tags',
             'url'