diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-01-30 19:47:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 19:47:16 -0500 |
| commit | 60c38ab83c429d9e4853dbd4ea9fa06eb8f9efa6 (patch) | |
| tree | 9cee934377c6d80ab53b852b876a9d82e48f9882 /ext/bg/js/settings2 | |
| parent | 828c4b11c14a13abe6ce352177ece341471e374f (diff) | |
Modal refactor (#1335)
* Rename modal-container to modal
* Update how modal IDs are handled
* Fix invalid modal check
* Update modal IDs
Diffstat (limited to 'ext/bg/js/settings2')
| -rw-r--r-- | ext/bg/js/settings2/keyboard-shortcuts-controller.js | 2 | ||||
| -rw-r--r-- | ext/bg/js/settings2/settings-display-controller.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/bg/js/settings2/keyboard-shortcuts-controller.js b/ext/bg/js/settings2/keyboard-shortcuts-controller.js index 30846a62..0dcfa2ee 100644 --- a/ext/bg/js/settings2/keyboard-shortcuts-controller.js +++ b/ext/bg/js/settings2/keyboard-shortcuts-controller.js @@ -45,7 +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._scrollContainer = document.querySelector('#keyboard-shortcuts-modal .modal-body'); this._addButton.addEventListener('click', this._onAddClick.bind(this)); this._resetButton.addEventListener('click', this._onResetClick.bind(this)); diff --git a/ext/bg/js/settings2/settings-display-controller.js b/ext/bg/js/settings2/settings-display-controller.js index 4dee0fab..75c147f2 100644 --- a/ext/bg/js/settings2/settings-display-controller.js +++ b/ext/bg/js/settings2/settings-display-controller.js @@ -162,13 +162,13 @@ class SettingsDisplayController { let [action, target] = modalAction.split(','); if (typeof target === 'undefined') { - const currentModal = node.closest('.modal-container'); + const currentModal = node.closest('.modal'); if (currentModal === null) { return; } - target = currentModal.id; + target = currentModal; } const modal = this._modalController.getModal(target); - if (typeof modal === 'undefined') { return; } + if (modal === null) { return; } switch (action) { case 'show': |