From 7a0f2650175dc8425b23cb2ef54cd2f77b834052 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 20 Dec 2020 10:28:45 +0100
Subject: [PATCH] Convert all Options passages to pure DOM
---
src/002-config/mousetrapConfig.js | 34 ++++++++++++++-
src/005-passages/options.js | 59 +++++++++++++++++++++++++++
src/gui/options/descriptionOptions.tw | 13 ------
src/gui/options/hotkeySettings.tw | 27 ------------
src/gui/options/options.tw | 11 -----
src/gui/options/summaryOptions.tw | 14 -------
src/interaction/siDescription.js | 2 +-
7 files changed, 93 insertions(+), 67 deletions(-)
create mode 100644 src/005-passages/options.js
delete mode 100644 src/gui/options/descriptionOptions.tw
delete mode 100644 src/gui/options/hotkeySettings.tw
delete mode 100644 src/gui/options/options.tw
delete mode 100644 src/gui/options/summaryOptions.tw
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index da2641fb38a..dd39ff0c3d8 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -255,11 +255,43 @@ App.UI.Hotkeys = (function() {
}
}
+ function settingsPage() {
+ const f = document.createDocumentFragment();
+
+ App.UI.DOM.appendNewElement("h1", f, "Hotkey Settings");
+
+ const p = document.createElement("p");
+ const ul = document.createElement("ul");
+
+ let li = document.createElement("li");
+ li.append("On keyboard layouts other than the ");
+ const a = document.createElement("a");
+ a.href = "https://en.wikipedia.org/wiki/File:KB_United_States.svg";
+ a.target = "_blank";
+ a.append("US-QWERTY layout");
+ li.append(a,
+ "there may be keys or combinations of keys where the recorded key is different from the key used to listen to key events. You will have to find these keys yourself through trial and error.");
+ ul.append(li);
+
+ App.UI.DOM.appendNewElement("li", ul, "Custom hotkeys are browser specific and are not part of your save.");
+
+ li = document.createElement("li");
+ li.append("While we try not to overwrite browser or OS level key combinations it is possible to do so with custom hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are available. There are however keys that cannot be overwritten, the ",
+ App.UI.DOM.makeElement("code", "Win key"), " on Windows is an example for this.");
+ ul.append(li);
+
+ p.append(ul);
+ f.append(p);
+
+ f.append(settingsMenu());
+ return f;
+ }
+
return {
add: addDefault,
hotkeys: hotkeysForAction,
init: init,
- settings: settingsMenu,
+ settings: settingsPage,
};
})();
diff --git a/src/005-passages/options.js b/src/005-passages/options.js
new file mode 100644
index 00000000000..ec6cf6a86d0
--- /dev/null
+++ b/src/005-passages/options.js
@@ -0,0 +1,59 @@
+new App.DomPassage("Options",
+ () => {
+ if (lastVisited("Slave Interact") === 1) {
+ V.storedLink = "Slave Interact";
+ } else {
+ V.storedLink = "Main";
+ }
+
+ V.nextButton = "Back";
+ V.nextLink = V.storedLink;
+ V.encyclopedia = "How to Play";
+
+ return App.UI.optionsPassage();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Description Options",
+ () => {
+ V.nextButton = "Back";
+ if (V.storedLink !== "Slave Interact") {
+ if (lastVisited("Slave Interact") === 1) {
+ V.storedLink = "Slave Interact";
+ } else {
+ V.storedLink = "Options";
+ }
+ }
+ V.nextLink = V.storedLink;
+
+ return App.UI.descriptionOptions();
+ },
+ ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Summary Options",
+ () => {
+ V.nextButton = "Back";
+ if (V.storedLink !== "Slave Interact" && V.storedLink !== "Main") {
+ if (lastVisited("Main") === 1) {
+ V.storedLink = "Main";
+ } else {
+ V.storedLink = "Options";
+ }
+ }
+ V.nextLink = V.storedLink;
+ V.passageSwitchHandler = App.EventHandlers.optionsChanged;
+
+ return App.UI.summaryOptions();
+ },
+ ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Hotkey Settings",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Main";
+
+ return App.UI.Hotkeys.settings();
+ }, ["jump-to-safe", "jump-from-safe"]
+);
diff --git a/src/gui/options/descriptionOptions.tw b/src/gui/options/descriptionOptions.tw
deleted file mode 100644
index 5ac19a8fb4a..00000000000
--- a/src/gui/options/descriptionOptions.tw
+++ /dev/null
@@ -1,13 +0,0 @@
-:: Description Options [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back">>
-<<if $storedLink !== "Slave Interact">>
- <<if lastVisited("Slave Interact") === 1>>
- <<set $storedLink = "Slave Interact">>
- <<else>>
- <<set $storedLink = "Options">>
- <</if>>
-<</if>>
-<<set $nextLink = $storedLink>>
-
-<<includeDOM App.UI.descriptionOptions()>>
diff --git a/src/gui/options/hotkeySettings.tw b/src/gui/options/hotkeySettings.tw
deleted file mode 100644
index b1bf6388eac..00000000000
--- a/src/gui/options/hotkeySettings.tw
+++ /dev/null
@@ -1,27 +0,0 @@
-:: Hotkey Settings [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<h1>Hotkey Settings</h1>
-
-<p>
- <ul>
- <li>
- On keyboard layouts other than the <a href="https://en.wikipedia.org/wiki/File:KB_United_States.svg"
- target="_blank">US-QWERTY layout</a> there may be keys or combinations of keys where the recorded key is
- different from the key used to listen to key events. You will have to find these keys yourself through trial
- and error.
- </li>
- <li>
- Custom hotkeys are browser specific and are not part of your save.
- </li>
- <li>
- While we try not to overwrite browser or OS level key combinations it is possible to do so with custom
- hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are
- available. There are however keys that cannot be overwritten, the <code>Win key</code> on Windows is an
- example for this.
- </li>
- </ul>
-</p>
-
-<<includeDOM App.UI.Hotkeys.settings()>>
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
deleted file mode 100644
index ca66ab0ffb9..00000000000
--- a/src/gui/options/options.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Options [nobr jump-to-safe jump-from-safe]
-
-<<if lastVisited("Slave Interact") === 1>>
- <<set $storedLink = "Slave Interact">>
-<<else>>
- <<set $storedLink = "Main">>
-<</if>>
-
-<<set $nextButton = "Back", $nextLink = $storedLink, $encyclopedia = "How to Play">>
-
-<<includeDOM App.UI.optionsPassage()>>
\ No newline at end of file
diff --git a/src/gui/options/summaryOptions.tw b/src/gui/options/summaryOptions.tw
deleted file mode 100644
index a5fcb72e82a..00000000000
--- a/src/gui/options/summaryOptions.tw
+++ /dev/null
@@ -1,14 +0,0 @@
-:: Summary Options [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back">>
-<<if $storedLink !== "Slave Interact" && $storedLink !== "Main">>
- <<if lastVisited("Main") === 1>>
- <<set $storedLink = "Main">>
- <<else>>
- <<set $storedLink = "Options">>
- <</if>>
-<</if>>
-<<set $nextLink = $storedLink>>
-<<set $passageSwitchHandler = App.EventHandlers.optionsChanged>>
-
-<<includeDOM App.UI.summaryOptions()>>
\ No newline at end of file
diff --git a/src/interaction/siDescription.js b/src/interaction/siDescription.js
index daeceffb745..86fddfb5659 100644
--- a/src/interaction/siDescription.js
+++ b/src/interaction/siDescription.js
@@ -34,7 +34,7 @@ App.UI.SlaveInteract.description = function(slave) {
"Description Options",
() => {
jQuery("#description-link").empty().append(hideOptions());
- jQuery("#description-options").empty().append(App.UI.DOM.renderPassage("Description Options"));
+ jQuery("#description-options").empty().append(App.UI.descriptionOptions());
}
);
}
--
GitLab