Use backend mathjax and jquery

MorenoTropical · Oct 11, 2024 · 5524c3a · 5524c3a
1 parent fd74509
commit 5524c3a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/AnkiDroid/src/main/assets/card_template.html b/AnkiDroid/src/main/assets/card_template.html
@@ -10,7 +10,7 @@
         </style>
         <link rel="stylesheet" type="text/css" href="file:///android_asset/backend/web/reviewer_extras.css">
         ::script::
-        <script src="file:///android_asset/jquery.min.js"> </script>
+        <script src="file:///android_asset/backend/web/jquery.min.js"> </script>
         <script src="file:///android_asset/scripts/card.js" type="text/javascript"> </script>
         <script src="file:///android_asset/scripts/js-api.js" type="text/javascript"> </script>
         <script src="file:///android_asset/backend/web/reviewer_extras_bundle.js"> </script>

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ViewerResourceHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ViewerResourceHandler.kt
@@ -25,10 +25,14 @@ import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.FileInputStream
+import java.nio.file.Paths
+import kotlin.io.path.pathString
 
 private const val RANGE_HEADER = "Range"
+private const val MATHJAX_PATH_PREFIX = "/_anki/js/vendor/mathjax"
 
 class ViewerResourceHandler(context: Context) {
+    private val assetManager = context.assets
     private val mediaDir = CollectionHelper.getMediaDirectory(context)
 
     fun shouldInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
@@ -43,6 +47,15 @@ class ViewerResourceHandler(context: Context) {
         }
 
         try {
+            if (path.startsWith(MATHJAX_PATH_PREFIX)) {
+                val mathjaxAssetPath = Paths.get(
+                    "backend/web/vendor/mathjax",
+                    path.removePrefix(MATHJAX_PATH_PREFIX)
+                ).pathString
+                val inputStream = assetManager.open(mathjaxAssetPath)
+                return WebResourceResponse(guessMimeType(path), null, inputStream)
+            }
+
             val file = File(mediaDir, path)
             if (!file.exists()) {
                 return null

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/AndroidCardRenderContext.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/AndroidCardRenderContext.kt
@@ -69,8 +69,8 @@ class AndroidCardRenderContext(
         val script = when (requiresMathjax) {
             false -> ""
             true ->
-                """        <script src="file:///android_asset/mathjax/conf.js"></script>
-        <script src="file:///android_asset/mathjax/tex-chtml.js"></script>"""
+                """        <script src="file:///android_asset/backend/web/mathjax.js"></script>
+        <script src="file:///android_asset/backend/web/vendor/mathjax/tex-chtml-full.js"></script>"""
         }
         val cardClass = cardAppearance.getCardClass(ord + 1) + if (requiresMathjax) " mathjax-needs-to-render" else ""
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerHelpers.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerHelpers.kt
@@ -85,8 +85,9 @@ fun stdHtml(
                     <div id="_mark" hidden>&#x2605;</div>
                     <div id="_flag" hidden>&#x2691;</div>
                     <div id="qa"></div>
-                    <script src="file:///android_asset/jquery.min.js"></script>
-                    <script src="file:///android_asset/mathjax/tex-chtml.js"></script>
+                    <script src="file:///android_asset/backend/web/jquery.min.js"></script>
+                    <script src="file:///android_asset/backend/web/mathjax.js"></script>
+                    <script src="file:///android_asset/backend/web/vendor/mathjax/tex-chtml-full.js"></script>
                     <script src="file:///android_asset/scripts/ankidroid.js"></script>
                     <script src="file:///android_asset/backend/web/reviewer.js"></script>
                     <script>bridgeCommand = function(){};</script>