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-27 19:34:14 -0500
committerGitHub <noreply@github.com>2021-01-27 19:34:14 -0500
commited0c0c20c095ac693dac3f1c4145e4c8dc83601a (patch)
tree6a426348a026e08c499f708b66797bfe14c91687 /ext/bg/js/settings2/settings-main.js
parent97bb05147e256699cf1b5e85c4ef88e510b9ace1 (diff)
Native keyboard shortcuts settings (#1322)
* Fix style issue * Add ExtensionKeyboardShortcutController * Move descriptions * Add separator line
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 76a40d81..31c5b0fa 100644
--- a/ext/bg/js/settings2/settings-main.js
+++ b/ext/bg/js/settings2/settings-main.js
@@ -24,6 +24,7 @@
* DictionaryController
* DictionaryImportController
* DocumentFocusController
+ * ExtensionKeyboardShortcutController
* GenericSettingController
* KeyboardShortcutController
* ModalController
@@ -133,6 +134,9 @@ async function setupGenericSettingsController(genericSettingController) {
const keyboardShortcutController = new KeyboardShortcutController(settingsController);
keyboardShortcutController.prepare();
+ const extensionKeyboardShortcutController = new ExtensionKeyboardShortcutController(settingsController);
+ extensionKeyboardShortcutController.prepare();
+
const popupWindowController = new PopupWindowController();
popupWindowController.prepare();