From 052d1c78f30eb1c4447cdf85ca702fb4d1d4a272 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Tue, 22 Dec 2020 00:22:05 +0100
Subject: [PATCH] Use domPassage for RA options
---
src/005-passages/facilitiesPassages.js | 6 ++++++
src/js/rulesAssistantOptions.js | 9 ++++++---
src/uncategorized/rulesAssistant.tw | 3 ---
3 files changed, 12 insertions(+), 6 deletions(-)
delete mode 100644 src/uncategorized/rulesAssistant.tw
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
index 8f67d52b80b..94cb18821ae 100644
--- a/src/005-passages/facilitiesPassages.js
+++ b/src/005-passages/facilitiesPassages.js
@@ -60,3 +60,9 @@ new App.DomPassage("Agent Select",
return f;
}, ["jump-from-safe"]
);
+
+new App.DomPassage("Rules Assistant", () => {
+ const div = document.createElement("div");
+ App.RA.options(div);
+ return div;
+}, ["jump-to-safe", "jump-from-safe"]);
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 084ea51d06e..c084389ccd9 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -5,14 +5,17 @@
// wrapped in a closure so as not to pollute the global namespace
// the widgets are generic enough to be reusable; if similar user interfaces are ported to JS, we could move the classes to the global scope
-globalThis.rulesAssistantOptions = (function() {
+/**
+ * @param {HTMLDivElement} div container for the RA UI
+ */
+App.RA.options = (function() {
"use strict";
const noDefaultSetting = {value: "!NDS!", text: "no default setting"};
/** @type {FC.RA.Rule} */
let current_rule, root;
- function rulesAssistantOptions(element) {
+ function rulesAssistantOptions(div) {
V.nextButton = "Back to Main";
V.nextLink = "Main";
V.returnTo = "Main";
@@ -25,7 +28,7 @@ globalThis.rulesAssistantOptions = (function() {
current_rule = V.defaultRules[idx];
}
}
- root = new Root(element);
+ root = new Root(div);
}
function returnP(e) { return e.keyCode === 13; }
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
deleted file mode 100644
index 662b7abb694..00000000000
--- a/src/uncategorized/rulesAssistant.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Rules Assistant [nobr jump-to-safe jump-from-safe]
-
-<<run html5passage(rulesAssistantOptions)>>
--
GitLab