From 293d108c08e1aa9c05e2566cfc66146246127e0d Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 4 Jun 2020 10:10:40 +0200
Subject: [PATCH] move from App.UI.Navigation to App.UI.Hotkeys
---
devTools/FC.ts | 3 ++-
src/002-config/mousetrapConfig.js | 23 +++++++++++++----------
src/gui/quicklinks.js | 6 +++---
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/devTools/FC.ts b/devTools/FC.ts
index 0e0e0d10555..554acdb0ab0 100644
--- a/devTools/FC.ts
+++ b/devTools/FC.ts
@@ -50,6 +50,8 @@ namespace App {
namespace Facilities {}
+ namespace Hotkeys {}
+
namespace Interact {}
namespace Intro {}
@@ -256,7 +258,6 @@ namespace App {
declare function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
}
namespace View { }
- namespace Navigation { }
namespace SlaveSummary {
type AppendRenderer = (slave: FC.SlaveState, parentNode: Node) => void;
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index 720f0514fb2..586c861857b 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -1,8 +1,7 @@
/**
* Expand mousetrap with multiple binds per key, passage dependent bindings and a menu for custom rebinding.
*/
-
-App.UI.Navigation = (function() {
+App.UI.Hotkeys = (function() {
/**
* @typedef action
* @property {Function} callback
@@ -71,6 +70,10 @@ App.UI.Navigation = (function() {
}
}
+ /**
+ * @param {string} name
+ * @returns {string}
+ */
function hotkeysForAction(name) {
if (!actions[name]) {
return "";
@@ -95,42 +98,42 @@ App.UI.Navigation = (function() {
})();
// add hotkeys
-App.UI.Navigation.add("Advance week", {
+App.UI.Hotkeys.add("Advance week", {
callback: function() {
$("#story-caption #endWeekButton a.macro-link").trigger("click");
}, combinations: ["enter"]
});
-App.UI.Navigation.add("Continue/Back", {
+App.UI.Hotkeys.add("Continue/Back", {
callback: function() {
$("#story-caption #nextButton a.macro-link").trigger("click");
}, combinations: ["space"]
});
-App.UI.Navigation.add("Previous Slave", {
+App.UI.Hotkeys.add("Previous Slave", {
callback: function() {
$("#prevSlave a.macro-link").trigger("click");
}, combinations: ["left", "q"]
});
-App.UI.Navigation.add("Next Slave", {
+App.UI.Hotkeys.add("Next Slave", {
callback: function() {
$("#nextSlave a.macro-link").trigger("click");
}, combinations: ["right", "e"]
});
-App.UI.Navigation.add("Previous Child", {
+App.UI.Hotkeys.add("Previous Child", {
callback: function() {
$("#prevChild a.macro-link").trigger("click");
}, combinations: ["left", "q"]
});
-App.UI.Navigation.add("Next Child", {
+App.UI.Hotkeys.add("Next Child", {
callback: function() {
$("#nextChild a.macro-link").trigger("click");
}, combinations: ["right", "e"]
});
-App.UI.Navigation.add("walkpast", {
+App.UI.Hotkeys.add("walkpast", {
callback: function() {
$("#walkpast a.macro-link").trigger("click");
}, combinations: ["f"]
});
-App.UI.Navigation.add("Manage HG", {
+App.UI.Hotkeys.add("Manage HG", {
callback: function() {
$("#manageHG a").trigger("click");
}, combinations: ["h"]
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 0f23b17fdde..44d689b915c 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -256,7 +256,7 @@ App.UI.quickMenu = (function() {
if (uiNames[passage]) {
action.uiName = uiNames[passage];
}
- App.UI.Navigation.add(passage, action);
+ App.UI.Hotkeys.add(passage, action);
}
}
}
@@ -284,7 +284,7 @@ App.UI.quickMenu = (function() {
history.shift();
}
});
- App.UI.Navigation.add("Back in history", {callback: goBack, combinations: ["backspace"]});
+ App.UI.Hotkeys.add("Back in history", {callback: goBack, combinations: ["backspace"]});
/**
* Goes back in history if possible.
@@ -460,7 +460,7 @@ App.UI.quickMenu = (function() {
Engine.play(passage);
};
div.prepend(a);
- const hotkeyString = App.UI.Navigation.hotkeys(passage);
+ const hotkeyString = App.UI.Hotkeys.hotkeys(passage);
if (hotkeyString !== "") {
div.append(" ", App.UI.DOM.makeElement("span", hotkeyString, "hotkey"));
}
--
GitLab