summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/settings2/keyboard-shortcuts-controller.js3
-rw-r--r--ext/mixed/js/display.js2
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/bg/js/settings2/keyboard-shortcuts-controller.js b/ext/bg/js/settings2/keyboard-shortcuts-controller.js
index 83b457c8..42b36e86 100644
--- a/ext/bg/js/settings2/keyboard-shortcuts-controller.js
+++ b/ext/bg/js/settings2/keyboard-shortcuts-controller.js
@@ -30,6 +30,7 @@ class KeyboardShortcutController {
this._listContainer = null;
this._emptyIndicator = null;
this._stringComparer = new Intl.Collator('en-US'); // Invariant locale
+ this._scrollContainer = null;
}
get settingsController() {
@@ -44,6 +45,7 @@ class KeyboardShortcutController {
this._resetButton = document.querySelector('#hotkey-list-reset');
this._listContainer = document.querySelector('#hotkey-list');
this._emptyIndicator = document.querySelector('#hotkey-list-empty');
+ this._scrollContainer = document.querySelector('#keyboard-shortcuts .modal-body');
this._addButton.addEventListener('click', this._onAddClick.bind(this));
this._resetButton.addEventListener('click', this._onResetClick.bind(this));
@@ -65,6 +67,7 @@ class KeyboardShortcutController {
}]);
await this._updateOptions();
+ this._scrollContainer.scrollTop = this._scrollContainer.scrollHeight;
}
async deleteEntry(index) {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 67db9097..0924a5fe 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -1927,7 +1927,7 @@ class Display extends EventDispatcher {
this._hotkeys.clear();
for (const {action, key, modifiers, scopes, enabled} of options.inputs.hotkeys) {
- if (!enabled || !scopes.includes(this._pageType)) { continue; }
+ if (!enabled || action === '' || !scopes.includes(this._pageType)) { continue; }
this._registerHotkey(key, modifiers, action);
}
}