diff options
Diffstat (limited to 'src/shared/settings')
-rw-r--r-- | src/shared/settings/default.js | 6 | ||||
-rw-r--r-- | src/shared/settings/storage.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js index 4ad81c4..3c4dcac 100644 --- a/src/shared/settings/default.js +++ b/src/shared/settings/default.js @@ -23,11 +23,13 @@ export default { "G": { "type": "scroll.bottom" }, "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, + "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, "K": { "type": "tabs.prev", "count": 1 }, "J": { "type": "tabs.next", "count": 1 }, "g0": { "type": "tabs.first" }, "g$": { "type": "tabs.last" }, + "<C-6>": { "type": "tabs.prevsel" }, "r": { "type": "tabs.reload", "cache": false }, "R": { "type": "tabs.reload", "cache": true }, "zp": { "type": "tabs.pin.toggle" }, @@ -61,9 +63,9 @@ export default { "duckduckgo": "https://duckduckgo.com/?q={}", "twitter": "https://twitter.com/search?q={}", "wikipedia": "https://en.wikipedia.org/w/index.php?search={}" - }, - "properties": { } + }, + "properties": { } }`, }; diff --git a/src/shared/settings/storage.js b/src/shared/settings/storage.js index 1edb441..25ebfcd 100644 --- a/src/shared/settings/storage.js +++ b/src/shared/settings/storage.js @@ -18,7 +18,9 @@ const loadValue = () => { } else if (settings.source === 'form') { value = settingsValues.valueFromForm(settings.form); } - return value; + return Object.assign({}, + settingsValues.valueFromJson(DefaultSettings.json), + value); }); }; |