summaryrefslogtreecommitdiff
path: root/ext/bg/js/settings2/settings-main.js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-01-14 20:56:18 -0500
committerGitHub <noreply@github.com>2021-01-14 20:56:18 -0500
commit84d3af0f8d26e06efb01e47a504d510f22caa970 (patch)
tree0dd7306bbe75d52526ac037562d9e79a33a939ec /ext/bg/js/settings2/settings-main.js
parent39741bf1d2336091a4d3592ea9ad037ef1f47f79 (diff)
Hotkeys (#1236)
* Set up hotkey inputs * Improve key display * Add setInput * Add KeyboardShortcutController * Update how display handles hotkeys
Diffstat (limited to 'ext/bg/js/settings2/settings-main.js')
-rw-r--r--ext/bg/js/settings2/settings-main.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/bg/js/settings2/settings-main.js b/ext/bg/js/settings2/settings-main.js
index fc003ac8..f2852ab1 100644
--- a/ext/bg/js/settings2/settings-main.js
+++ b/ext/bg/js/settings2/settings-main.js
@@ -25,6 +25,7 @@
* DictionaryImportController
* DocumentFocusController
* GenericSettingController
+ * KeyboardShortcutController
* ModalController
* NestedPopupsController
* PopupPreviewController
@@ -128,6 +129,9 @@ async function setupGenericSettingsController(genericSettingController) {
const sentenceTerminationCharactersController = new SentenceTerminationCharactersController(settingsController);
sentenceTerminationCharactersController.prepare();
+ const keyboardShortcutController = new KeyboardShortcutController(settingsController);
+ keyboardShortcutController.prepare();
+
await Promise.all(preparePromises);
document.documentElement.dataset.loaded = 'true';