Merge pull request #1119 from hgiesel/reviewerdropjquery

Remove last jQuery from reviewer.ts / Remove fadeTime

qt/aqt/data/web/css/reviewer.scss

@@ -27,7 +27,6 @@ img {
     right: 10px;
     top: 0;
     font-size: 30px;
-    display: none;
     -webkit-text-stroke-width: 1px;
     -webkit-text-stroke-color: black;
 }
@@ -38,7 +37,6 @@ img {
     top: 0;
     font-size: 30px;
     color: yellow;
-    display: none;
     -webkit-text-stroke-width: 1px;
     -webkit-text-stroke-color: black;
 }

qt/aqt/data/web/js/reviewer.ts

@@ -6,12 +6,9 @@ declare var MathJax: any;
 type Callback = () => void | Promise<void>;
 
 var ankiPlatform = "desktop";
-var typeans;
+var typeans: HTMLElement | undefined;
 var _updatingQueue: Promise<void> = Promise.resolve();
 
-var qFade = 0;
-var aFade = 0;
-
 var onUpdateHook: Array<Callback>;
 var onShownHook: Array<Callback>;
 
@@ -29,34 +26,56 @@ function _queueAction(action: Callback): void {
     _updatingQueue = _updatingQueue.then(action);
 }
 
+function setInnerHTML(element: Element, html: string): void {
+    for (const oldVideo of element.getElementsByTagName("video")) {
+        oldVideo.pause();
+
+        while (oldVideo.firstChild) {
+            oldVideo.removeChild(oldVideo.firstChild);
+        }
+
+        oldVideo.load();
+    }
+
+    element.innerHTML = html;
+
+    for (const oldScript of element.getElementsByTagName("script")) {
+        const newScript = document.createElement("script");
+
+        for (const attribute of oldScript.attributes) {
+            newScript.setAttribute(attribute.name, attribute.value);
+        }
+
+        newScript.appendChild(document.createTextNode(oldScript.innerHTML));
+        oldScript.parentNode.replaceChild(newScript, oldScript);
+    }
+}
+
 async function _updateQA(
     html: string,
-    fadeTime: number,
+    _unusused: unknown,
     onupdate: Callback,
     onshown: Callback
 ): Promise<void> {
     onUpdateHook = [onupdate];
     onShownHook = [onshown];
 
-    const qa = $("#qa");
+    const qa = document.getElementById("qa")!;
     const renderError = (kind: string) => (error: Error): void => {
         const errorMessage = String(error).substring(0, 2000);
         const errorStack = String(error.stack).substring(0, 2000);
-
+        qa.innerHTML = `Invalid ${kind} on card: ${errorMessage}\n${errorStack}`.replace(
-        qa.html(
+            /\n/g,
-            `Invalid ${kind} on card: ${errorMessage}\n${errorStack}`.replace(
+            "<br>"
-                /\n/g,
-                "<br />"
-            )
         );
     };
 
-    // fade out current text
+    // hide current card
-    await qa.fadeTo(fadeTime, 0).promise();
+    qa.style.opacity = "0";
 
-    // update text
+    // update card
     try {
-        qa.html(html);
+        setInnerHTML(qa, html);
     } catch (error) {
         renderError("HTML")(error);
     }
@@ -69,15 +88,15 @@ async function _updateQA(
             // clear MathJax buffers from previous typesets
             MathJax.typesetClear();
 
-            return MathJax.typesetPromise(qa.slice(0, 1));
+            return MathJax.typesetPromise([qa]);
         })
         .catch(renderError("MathJax"));
 
     // defer display for up to 100ms to allow images to load
     await Promise.race([allImagesLoaded(), new Promise((r) => setTimeout(r, 100))]);
 
-    // and reveal when processing is done
+    // and reveal card when processing is done
-    await qa.fadeTo(fadeTime, 1).promise();
+    qa.style.opacity = "1";
     await _runHook(onShownHook);
 }
 
@@ -85,7 +104,7 @@ function _showQuestion(q: string, bodyclass: string): void {
     _queueAction(() =>
         _updateQA(
             q,
-            qFade,
+            null,
             function () {
                 // return to top of window
                 window.scrollTo(0, 0);
@@ -107,7 +126,7 @@ function _showAnswer(a: string, bodyclass: string): void {
     _queueAction(() =>
         _updateQA(
             a,
-            aFade,
+            null,
             function () {
                 if (bodyclass) {
                     //  when previewing
@@ -131,26 +150,26 @@ const _flagColours = {
 };
 
 function _drawFlag(flag: 0 | 1 | 2 | 3 | 4): void {
-    var elem = $("#_flag");
+    const elem = document.getElementById("_flag");
     if (flag === 0) {
-        elem.hide();
+        elem.setAttribute("hidden", "");
         return;
     }
-    elem.show();
+    elem.removeAttribute("hidden");
-    elem.css("color", _flagColours[flag]);
+    elem.style.color = _flagColours[flag];
 }
 
 function _drawMark(mark: boolean): void {
-    var elem = $("#_mark");
+    const elem = document.getElementById("_mark");
     if (!mark) {
-        elem.hide();
+        elem.setAttribute("hidden", "");
     } else {
-        elem.show();
+        elem.removeAttribute("hidden");
     }
 }
 
 function _typeAnsPress(): void {
-    if ((window.event as KeyboardEvent).keyCode === 13) {
+    if ((window.event as KeyboardEvent).code === "Enter") {
         pycmd("ans");
     }
 }
@@ -171,13 +190,12 @@ function allImagesLoaded(): Promise<void[]> {
 }
 
 function imageLoaded(img: HTMLImageElement): Promise<void> {
-    if (img.complete) {
+    return img.complete
-        return;
+        ? Promise.resolve()
-    }
+        : new Promise((resolve) => {
-    return new Promise((resolve) => {
+              img.addEventListener("load", () => resolve());
-        img.addEventListener("load", () => resolve());
+              img.addEventListener("error", () => resolve());
-        img.addEventListener("error", () => resolve());
+          });
-    });
 }
 
 function scrollToAnswer(): void {

qt/aqt/reviewer.py

@@ -184,10 +184,10 @@ class Reviewer:
         if self.mw.pm.video_driver() == VideoDriver.Software:
             fade = "<script>qFade=0;</script>"
         return f"""
-<div id=_mark>&#x2605;</div>
+<div id="_mark" hidden>&#x2605;</div>
-<div id=_flag>&#x2691;</div>
+<div id="_flag" hidden>&#x2691;</div>
 {fade}
-<div id=qa></div>
+<div id="qa"></div>
 {extra}
 """