From 657ca0b948fe2915bab056081c5494fe089f7afc Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Sun, 29 Jan 2023 18:30:05 +0100
Subject: wrap lines in user script editor + show refold-tools version in
 yomichan info

---
 makefile                    |  3 ++-
 yomichan/.gitignore         |  1 +
 yomichan/info.html.diff.m4  | 19 +++++++++++++++++++
 yomichan/makefile           |  8 +++++++-
 yomichan/settings.html.diff |  4 ++--
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 yomichan/info.html.diff.m4

diff --git a/makefile b/makefile
index 8f834fb..cd4efb4 100644
--- a/makefile
+++ b/makefile
@@ -7,7 +7,8 @@ ARTIFACTS := yomichan/yomichan-chrome-patched.zip \
 all: $(ARTIFACTS)
 
 yomichan/yomichan-chrome-patched.zip:
-	make -BC yomichan yomichan-chrome-patched.zip
+	make -C yomichan clean
+	make -C yomichan yomichan-chrome-patched.zip
 
 anki-card-template/back-template.html anki-card-template/front-template.html:
 	make -BC anki-card-template
diff --git a/yomichan/.gitignore b/yomichan/.gitignore
index 547de8d..c224df1 100644
--- a/yomichan/.gitignore
+++ b/yomichan/.gitignore
@@ -2,3 +2,4 @@ yomichan-settings-*.json
 yomichan
 yomichan-chrome.zip
 yomichan-chrome-patched.zip
+info.html.diff
diff --git a/yomichan/info.html.diff.m4 b/yomichan/info.html.diff.m4
new file mode 100644
index 0000000..8166f82
--- /dev/null
+++ b/yomichan/info.html.diff.m4
@@ -0,0 +1,19 @@
+include(`common.m4')
+--- yomichan-original/info.html	2022-10-30 12:39:42.000000000 +0100
++++ yomichan/info.html	2023-01-29 18:26:05.496933182 +0100
+@@ -30,6 +30,7 @@
+         <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
+             <ul>
+                 <li>Extension version: <span id="version"></span></li>
++                <li>refold-tools version: <span id="version">VERSION()</span></li>
+                 <li>Platform: <span id="platform"></span></li>
+                 <li>Browser: <span id="browser"></span></li>
+                 <li>Language: <span id="language"></span></li>
+@@ -49,6 +50,7 @@
+                 <li>Support and source code: <a href="https://github.com/FooSoft/yomichan" rel="noreferrer noopener">Github</a></li>
+                 <li>Release notes: <a href="https://github.com/FooSoft/yomichan/releases" rel="noreferrer noopener" data-href-format="https://github.com/FooSoft/yomichan/releases/tag/{version}" id="release-notes-this-version-link">This version</a> | <a href="https://github.com/FooSoft/yomichan/releases" rel="noreferrer noopener">All versions</a></li>
+                 <li>More extension information: <a href="/permissions.html">Permissions</a> | <a href="/legal.html">Licenses</a> | <a href="/issues.html">Issues</a></li>
++                <li>refold-tools: <a href="https://github.com/lonkaars/refold-tools">GitHub</a> | <a href="https://git.pipeframe.xyz/lonkaars/refold-tools">cgit</a></li>
+             </ul>
+         </div></div></div></div>
+     </div>
diff --git a/yomichan/makefile b/yomichan/makefile
index f1ef964..f0285e5 100644
--- a/yomichan/makefile
+++ b/yomichan/makefile
@@ -31,8 +31,11 @@ yomichan/manifest.json.bak:
 yomichan/search.html.bak:
 	cp yomichan/search.html $@
 
+info.html.diff: info.html.diff.m4
+
 yomichan/search.html.patched: search.html.diff
 yomichan/settings.html.patched: settings.html.diff
+yomichan/info.html.patched: info.html.diff
 yomichan/manifest.json.patched: yomichan/manifest.json.bak
 	jq '.content_scripts[0].js[.content_scripts[0].js | length] |= .+ "js/userscript-loader.js"' $< |\
 	jq '.content_security_policy |= .+ "'"; script-src 'self' 'unsafe-eval'"'"' |\
@@ -43,6 +46,7 @@ backup: download
 backup: yomichan/manifest.json.bak
 backup: yomichan/search.html.bak
 backup: yomichan/settings.html.bak
+backup: yomichan/info.html.bak
 patch: backup
 patch: yomichan/js/userscript-loader.js
 patch: yomichan/images/script.svg
@@ -50,12 +54,14 @@ patch: yomichan/css/userscript-settings.css
 patch: yomichan/search.html.patched
 patch: yomichan/settings.html.patched
 patch: yomichan/manifest.json.patched
+patch: yomichan/info.html.patched
 patch:
 	mv yomichan/search.html.patched yomichan/search.html
 	mv yomichan/settings.html.patched yomichan/settings.html
+	mv yomichan/info.html.patched yomichan/info.html
 	mv yomichan/manifest.json.patched yomichan/manifest.json
 
-yomichan-chrome-patched.zip: patch
+yomichan-chrome-patched.zip: clean patch
 	zip -qr $@ yomichan
 
 clean:
diff --git a/yomichan/settings.html.diff b/yomichan/settings.html.diff
index 2644ab3..1b6064f 100644
--- a/yomichan/settings.html.diff
+++ b/yomichan/settings.html.diff
@@ -1,5 +1,5 @@
 --- yomichan-original/settings.html	2022-10-30 12:39:42.000000000 +0100
-+++ yomichan/settings.html	2023-01-29 15:42:10.643564451 +0100
++++ yomichan/settings.html	2023-01-29 18:28:49.783600435 +0100
 @@ -14,6 +14,8 @@
      <link rel="stylesheet" type="text/css" href="/css/material.css">
      <link rel="stylesheet" type="text/css" href="/css/settings.css">
@@ -54,7 +54,7 @@
 +        </div>
 +        <div class="modal-body" id="user-script-container">
 +            <div class="user-script-header">user.js (runs on search page and in popup frame)</div>
-+            <textarea class="no-wrap" autocomplete="off" spellcheck="false" id="user-script-editor" data-setting="general.userScript" data-tab-action="indent,4"></textarea>
++            <textarea autocomplete="off" spellcheck="false" id="user-script-editor" data-setting="general.userScript" data-tab-action="indent,4"></textarea>
 +        </div>
 +        <div class="modal-footer">
 +            <button data-modal-action="hide">Close</button>
-- 
cgit v1.2.3