mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-06 03:18:19 +00:00
Refactor ZenKeyboardShortcuts to use static method for default shortcuts retrieval
This commit is contained in:
@@ -578,9 +578,8 @@ class ZenKeyboardShortcutsLoader {
|
||||
async remove() {
|
||||
await IOUtils.remove(this.shortcutsFile);
|
||||
}
|
||||
}
|
||||
|
||||
function zenGetDefaultShortcuts() {
|
||||
static zenGetDefaultShortcuts() {
|
||||
// DO NOT CHANGE ANYTHING HERE
|
||||
// For adding new default shortcuts, add them to inside the migration function
|
||||
// and increment the version number.
|
||||
@@ -727,6 +726,7 @@ function zenGetDefaultShortcuts() {
|
||||
);
|
||||
|
||||
return newShortcutList;
|
||||
}
|
||||
}
|
||||
|
||||
class ZenKeyboardShortcutsVersioner {
|
||||
@@ -789,7 +789,7 @@ class ZenKeyboardShortcutsVersioner {
|
||||
// Migrate from 0 to 1
|
||||
// Here, we do a complet reset of the shortcuts,
|
||||
// since nothing seems to work properly.
|
||||
data = zenGetDefaultShortcuts();
|
||||
data = ZenKeyboardShortcutsLoader.zenGetDefaultShortcuts();
|
||||
}
|
||||
if (version < 2) {
|
||||
// Migrate from 1 to 2
|
||||
@@ -819,7 +819,7 @@ class ZenKeyboardShortcutsVersioner {
|
||||
// detection for internal keys was not working properly, so every internal
|
||||
// shortcut was being saved as a user-editable shortcut.
|
||||
// This migration will fix this issue.
|
||||
const defaultShortcuts = zenGetDefaultShortcuts();
|
||||
const defaultShortcuts = ZenKeyboardShortcutsLoader.zenGetDefaultShortcuts();
|
||||
// Get the default shortcut, compare the id and set the internal flag if needed
|
||||
for (let shortcut of data) {
|
||||
for (let defaultShortcut of defaultShortcuts) {
|
||||
|
Reference in New Issue
Block a user