Make compatible with Closet

Author: abdnh

src/anking_notetypes/editor.py

@@ -94,7 +94,7 @@ def make_insertion_js(field_index: int, text: str) -> str:
 
     cmd = (
         f"pycmd(`key:{field_index}:${{getNoteId()}}:{escaped}`); "
-        f"EditorCloset.setFieldHTML({field_index}, `{escaped}`); "
+        f"EditorIO.setFieldHTML({field_index}, `{escaped}`); "
     )
     return cmd
 
@@ -106,7 +106,7 @@ def insert_into_zero_indexed(editor, text: str) -> None:
         if not match or int(match[0]) != 0:
             continue
 
-        editor.web.eval(f"EditorCloset.insertIntoZeroIndexed(`{text}`, {index}); ")
+        editor.web.eval(f"EditorIO.insertIntoZeroIndexed(`{text}`, {index}); ")
         break
 
 
@@ -157,13 +157,13 @@ def add_occlusion_messages(
     if isinstance(context, Editor):
         editor: Editor = context
         global old_occlusion_indices, occlusion_editor_active  # pylint: disable=global-statement
-        if message.startswith("oldOcclusions"):
+        if message.startswith("ankingOldOcclusions"):
             _, _src, index_text = message.split(":", 2)
             old_occlusion_indices = process_occlusion_index_text(index_text)
 
             return (True, None)
 
-        elif message.startswith("newOcclusions"):
+        elif message.startswith("ankingNewOcclusions"):
             _, _src, index_text = message.split(":", 2)
             indices = process_occlusion_index_text(index_text)
 
@@ -172,7 +172,7 @@ def add_occlusion_messages(
 
             return (True, could_fill)
 
-        elif message.startswith("occlusionText"):
+        elif message.startswith("ankingOcclusionText"):
             text = message.split(":", 1)[1]
 
             if occlusion_behavior == "autopaste":
@@ -182,19 +182,19 @@ def add_occlusion_messages(
 
             return (True, None)
 
-        elif message == "occlusionEditorActive":
+        elif message == "ankingOcclusionEditorActive":
             occlusion_editor_active = True
             return (True, None)
 
-        elif message == "occlusionEditorInactive":
+        elif message == "ankingOcclusionEditorInactive":
             occlusion_editor_active = False
             return (True, None)
 
-        elif message.startswith("closetRefocus"):
+        elif message.startswith("ankingClosetRefocus"):
             refocus(editor)
             return (True, None)
 
-        elif message.startswith("closetMultipleImages"):
+        elif message.startswith("ankingClosetMultipleImages"):
             showInfo("Cannot start occlusion editor if field contains multiple images.")
             return (True, None)
 
@@ -235,7 +235,7 @@ def toggle_occlusion_mode(editor):
 
     if not is_io_note_type(model["name"]):
         showInfo("Please choose an AnKing image occlusion note type")
-        editor.web.eval("EditorCloset.setInactive()")
+        editor.web.eval("EditorIO.setInactive()")
         return
 
     addon_package = mw.addonManager.addonFromModule(__name__)
@@ -245,7 +245,7 @@ def toggle_occlusion_mode(editor):
     if not mw.focusWidget() is editor:
         refocus(editor)
 
-    editor.web.eval(f"EditorCloset.toggleOcclusionMode({js_path}, {max_code_fields})")
+    editor.web.eval(f"EditorIO.toggleOcclusionMode({js_path}, {max_code_fields})")
 
 
 def add_occlusion_button(buttons, editor):
@@ -256,13 +256,15 @@ def add_occlusion_button(buttons, editor):
 
     occlusion_button = editor._addButton(  # pylint: disable=protected-access
         str(icon_path.absolute()),
-        "occlude",
+        "anking_occlude",
         f"Put all fields into occlusion mode ({shortcut_as_text})",
-        id="closetOcclude",
+        id="ankingOcclude",
         disables=False,
     )
 
-    editor._links["occlude"] = toggle_occlusion_mode  # pylint: disable=protected-access
+    editor._links[  # pylint: disable=protected-access
+        "anking_occlude"
+    ] = toggle_occlusion_mode
     buttons.insert(-1, occlusion_button)
 
 
@@ -271,7 +273,8 @@ def wrap_as_option(name: str, code: str, tooltip: str, shortcut_text: str) -> st
 
 
 def add_buttons(buttons, editor):
-    editor.occlusion_editor_active = False
+    global occlusion_editor_active  # pylint: disable=global-statement
+    occlusion_editor_active = False
 
     add_occlusion_button(buttons, editor)
 
@@ -282,7 +285,7 @@ def add_occlusion_shortcut(cuts, editor):
 
 occlusion_container_pattern = re.compile(
     # remove trailing <br> to prevent accumulation
-    r'<div class="closet-occlusion-container">.*?(<img.*?>).*?</div>(<br>)*'
+    r'<div class="anking-occlusion-container">.*?(<img.*?>).*?</div>(<br>)*'
 )
 
 
@@ -296,16 +299,16 @@ def remove_occlusion_code(txt: str, _editor) -> str:
 
 
 def clear_occlusion_mode(js, _note, _editor):
-    return f"EditorCloset.clearOcclusionMode().then(() => {{ {js} }}); "
+    return f"EditorIO.clearOcclusionMode().then(() => {{ {js} }}); "
 
 
 def refocus(editor):
     editor.web.setFocus()
-    editor.web.eval("EditorCloset.refocus(); ")
+    editor.web.eval("EditorIO.refocus(); ")
 
 
 def maybe_refocus(editor):
-    editor.web.eval("EditorCloset.maybeRefocus(); ")
+    editor.web.eval("EditorIO.maybeRefocus(); ")
 
 
 def init_webview():

src/anking_notetypes/note_types/IO-one by one/Back Template.html

@@ -319,11 +319,11 @@
       toggleAllButton.title = `Shortcut: ${window.toggleAllShortcut}`;
       revealNextButton.title = `Shortcut: ${window.revealNextShortcut}`;
 
-      let rect = document.querySelector(".closet-rect.is-active")
+      let rect = document.querySelector(".anking-rect.is-active")
       if (rect) {
         activate(rect)
         observer.disconnect()
-        globalThis.AnkingIORects = document.querySelectorAll(".closet-rect.is-active")
+        globalThis.AnkingIORects = document.querySelectorAll(".anking-rect.is-active")
         for (let rect of globalThis.AnkingIORects) {
           rect.addEventListener("click", reveal)
         }
@@ -366,7 +366,7 @@
 
 
     window.toggleNext = function() {
-      let active = document.querySelector(".closet-rect.is-highlighted")
+      let active = document.querySelector(".anking-rect.is-highlighted")
       if (active) incrementalReveal.call(active)
     }
 
@@ -379,7 +379,7 @@
         for (let rect of globalThis.AnkingIORects) {
           hide.call(rect)
         }
-        let newActiveRect = document.querySelector(".closet-rect.is-active")
+        let newActiveRect = document.querySelector(".anking-rect.is-active")
         activate(newActiveRect)
       } else {
         for (let rect of globalThis.AnkingIORects) {
@@ -421,7 +421,7 @@
   setupIncrementalIO()
 </script>
 
-<script data-name="Closet Setup" data-version="v0.1">
+<script data-name="AnKing Closet Setup" data-version="v0.1">
   function closetUserLogic(closet, preset, chooseMemory) {
     const elements = closet.template.anki.getQaChildNodes();
     const memory = chooseMemory("closet__1");
@@ -455,13 +455,13 @@
 
   var getAnkiPrefix = () => globalThis.ankiPlatform === "desktop" ? "" : globalThis.AnkiDroidJS ? "https://appassets.androidplatform.net" : ".";
 
-  var closetFilename = "__closet-0.6.2.js";
+  var closetFilename = "__ankingio-0.6.2.js";
   var closetPromise = import(`${getAnkiPrefix()}/${closetFilename}`);
   closetPromise
   .then(
     ({ closet }) => closet.template.anki.initialize(closet, closetUserLogic, "{{Card}}", "{{Tags}}", "back"),
-    (error) => console.log("An error occured while loading Closet:", error))
-  .catch((error) => console.log("An error occured while executing Closet:", error));
+    (error) => console.log("An error occured while loading AnKing Closet:", error))
+  .catch((error) => console.log("An error occured while executing AnKing Closet:", error));
 
   if (globalThis.onUpdateHook) {
     onUpdateHook.push(() => closetPromise);

src/anking_notetypes/note_types/IO-one by one/IO-one by one.json

@@ -99,7 +99,6 @@
             ]
         ]
     ],
-    "closetVersion": "0.6.1",
     "vers": [],
     "assetManagerHtml": {
         "enabled": true,
@@ -149,7 +148,7 @@
                 "version": "v0.1"
             },
             {
-                "code": "/* Script by Matthias Metelka @kleinerpirat */\n\n(function () {\n    var observer = new MutationObserver(() => {\n        let rect = document.querySelector(\".closet-rect.is-active\")\n        if (rect) {\n            activate(rect)\n            observer.disconnect()\n            let rects = document.querySelectorAll(\".closet-rect.is-active\")\n            for (let rect of rects) {\n                rect.addEventListener(\"click\", reveal)\n            }\n            if (!globalThis.AnKingIOListening) {\n                document.addEventListener(\"keydown\", (event) => {\n                    if (event.key == \"n\") {\n                        let active = document.querySelector(\".closet-rect.is-highlighted\")\n                        if (active) incrementalReveal.call(active)\n                    }\n                    else if (event.key == \"g\") {\n                        for (let rect of rects) {\n                            incrementalReveal.call(rect)\n                        }\n                    }\n                })\n                globalThis.AnKingIOListening = true\n            }\n            let buttons = document.getElementsByClassName(\"extra-btn\")\n\n            function toggle() {\n                if (!this.classList.contains(\"uncollapsed\")) {\n                    this.nextElementSibling.classList.remove(\"hidden\")\n                    this.classList.add(\"uncollapsed\")\n                }\n                else {\n                    this.nextElementSibling.classList.add(\"hidden\")\n                    this.classList.remove(\"uncollapsed\")\n                }\n            }\n            for (let button of buttons) {\n                button.addEventListener(\"click\", toggle)\n            }\n        }\n    })\n    observer.observe(document.getElementById(\"qa\"), {\n        childList: true,\n        subtree: true\n    })\n\n    function activate(rect) {\n        rect.classList.add(\"is-highlighted\")\n        rect.addEventListener(\"click\", incrementalReveal)\n    }\n\n    function incrementalReveal() {\n        reveal.call(this)\n        let next = this.nextElementSibling\n        if (next) {\n            while (next.classList.contains(\"revealed\") && next.nextElementSibling) {\n                next = next.nextElementSibling\n            }\n            if (!next.classList.contains(\"revealed\")) activate(next)\n        }\n        else {\n            document.getElementById(\"extra-content\").classList.remove(\"hidden\")\n        }\n    }\n\n    function reveal() {\n        this.classList.remove(\"is-highlighted\")\n        this.classList.add(\"revealed\")\n    }\n})()",
+                "code": "/* Script by Matthias Metelka @kleinerpirat */\n\n(function () {\n    var observer = new MutationObserver(() => {\n        let rect = document.querySelector(\".anking-rect.is-active\")\n        if (rect) {\n            activate(rect)\n            observer.disconnect()\n            let rects = document.querySelectorAll(\".anking-rect.is-active\")\n            for (let rect of rects) {\n                rect.addEventListener(\"click\", reveal)\n            }\n            if (!globalThis.AnKingIOListening) {\n                document.addEventListener(\"keydown\", (event) => {\n                    if (event.key == \"n\") {\n                        let active = document.querySelector(\".anking-rect.is-highlighted\")\n                        if (active) incrementalReveal.call(active)\n                    }\n                    else if (event.key == \"g\") {\n                        for (let rect of rects) {\n                            incrementalReveal.call(rect)\n                        }\n                    }\n                })\n                globalThis.AnKingIOListening = true\n            }\n            let buttons = document.getElementsByClassName(\"extra-btn\")\n\n            function toggle() {\n                if (!this.classList.contains(\"uncollapsed\")) {\n                    this.nextElementSibling.classList.remove(\"hidden\")\n                    this.classList.add(\"uncollapsed\")\n                }\n                else {\n                    this.nextElementSibling.classList.add(\"hidden\")\n                    this.classList.remove(\"uncollapsed\")\n                }\n            }\n            for (let button of buttons) {\n                button.addEventListener(\"click\", toggle)\n            }\n        }\n    })\n    observer.observe(document.getElementById(\"qa\"), {\n        childList: true,\n        subtree: true\n    })\n\n    function activate(rect) {\n        rect.classList.add(\"is-highlighted\")\n        rect.addEventListener(\"click\", incrementalReveal)\n    }\n\n    function incrementalReveal() {\n        reveal.call(this)\n        let next = this.nextElementSibling\n        if (next) {\n            while (next.classList.contains(\"revealed\") && next.nextElementSibling) {\n                next = next.nextElementSibling\n            }\n            if (!next.classList.contains(\"revealed\")) activate(next)\n        }\n        else {\n            document.getElementById(\"extra-content\").classList.remove(\"hidden\")\n        }\n    }\n\n    function reveal() {\n        this.classList.remove(\"is-highlighted\")\n        this.classList.add(\"revealed\")\n    }\n})()",
                 "conditions": [
                     "side",
                     "=",

src/anking_notetypes/note_types/IO-one by one/Styling.css

@@ -1,4 +1,4 @@
-@import url("__closet-0.6.1.css");
+@import url("__ankingio-0.6.2.css");
 
 
 /*#########################################################
@@ -441,18 +441,18 @@ ul ul, table ul, ol ol, table ol {
 
 
 /* ~~~~~~INCREMENTAL REVEAL: Closet rects~~~~~~ */
-.closet-rect.is-active.is-back rect {
+.anking-rect.is-active.is-back rect {
   fill: var(--rect-bg);
   stroke: var(--rect-border);
   cursor: pointer;
 }
 
-.closet-rect.is-active.is-back.is-highlighted rect {
+.anking-rect.is-active.is-back.is-highlighted rect {
   fill: var(--active-rect-bg);
   stroke: var(--active-rect-border);
 }
 
-.closet-rect.revealed rect {
+.anking-rect.revealed rect {
   visibility: hidden;
 }
 

src/anking_notetypes/note_types/Physeo-IO one by one/Back Template.html

@@ -318,11 +318,11 @@
       toggleAllButton.title = `Shortcut: ${window.toggleAllShortcut}`;
       revealNextButton.title = `Shortcut: ${window.revealNextShortcut}`;
 
-      let rect = document.querySelector(".closet-rect.is-active")
+      let rect = document.querySelector(".anking-rect.is-active")
       if (rect) {
         activate(rect)
         observer.disconnect()
-        globalThis.AnkingIORects = document.querySelectorAll(".closet-rect.is-active")
+        globalThis.AnkingIORects = document.querySelectorAll(".anking-rect.is-active")
         for (let rect of globalThis.AnkingIORects) {
           rect.addEventListener("click", reveal)
         }
@@ -365,7 +365,7 @@
 
 
     window.toggleNext = function() {
-      let active = document.querySelector(".closet-rect.is-highlighted")
+      let active = document.querySelector(".anking-rect.is-highlighted")
       if (active) incrementalReveal.call(active)
     }
 
@@ -378,7 +378,7 @@
         for (let rect of globalThis.AnkingIORects) {
           hide.call(rect)
         }
-        let newActiveRect = document.querySelector(".closet-rect.is-active")
+        let newActiveRect = document.querySelector(".anking-rect.is-active")
         activate(newActiveRect)
       } else {
         for (let rect of globalThis.AnkingIORects) {
@@ -420,7 +420,7 @@
   setupIncrementalIO()
 </script>
 
-<script data-name="Closet Setup" data-version="v0.1">
+<script data-name="AnKing Closet Setup" data-version="v0.1">
   function closetUserLogic(closet, preset, chooseMemory) {
     const elements = closet.template.anki.getQaChildNodes();
     const memory = chooseMemory("closet__1");
@@ -454,13 +454,13 @@
 
   var getAnkiPrefix = () => globalThis.ankiPlatform === "desktop" ? "" : globalThis.AnkiDroidJS ? "https://appassets.androidplatform.net" : ".";
 
-  var closetFilename = "__closet-0.6.2.js";
+  var closetFilename = "__ankingio-0.6.2.js";
   var closetPromise = import(`${getAnkiPrefix()}/${closetFilename}`);
   closetPromise
   .then(
     ({ closet }) => closet.template.anki.initialize(closet, closetUserLogic, "{{Card}}", "{{Tags}}", "back"),
-    (error) => console.log("An error occured while loading Closet:", error))
-  .catch((error) => console.log("An error occured while executing Closet:", error));
+    (error) => console.log("An error occured while loading AnKing Closet:", error))
+  .catch((error) => console.log("An error occured while executing AnKing Closet:", error));
 
   if (globalThis.onUpdateHook) {
     onUpdateHook.push(() => closetPromise);