jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix but failed

Browse source
This commit is contained in:
Shin'ya Ueoka 2018-06-28 20:44:57 +09:00
parent 03cf265eff
commit e2fb33bdc5
20 changed files with 74 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/content/actions/operation.js
View file

@ -8,7 +8,7 @@ import * as consoleFrames from 'content/console-frames';
import * as addonActions from './addon';
import * as properties from 'shared/settings/properties';
// eslint-disable-next-line complexity
// eslint-disable-next-line complexity, max-lines-per-function
const exec = (operation, repeat, settings) => {
let smoothscroll = settings.properties.smoothscroll ||
properties.defaults.smoothscroll;

7
src/content/actions/setting.js
View file

@ -10,7 +10,7 @@ const reservedKeymaps = {
const set = (value) => {
let entries = [];
if (value.keymaps) {
let keymaps = Object.assign({}, value.keymaps, reservedKeymaps);
let keymaps = { ...value.keymaps, ...reservedKeymaps };
entries = Object.entries(keymaps).map((entry) => {
return [
keyUtils.fromMapKeys(entry[0]),
@ -21,9 +21,8 @@ const set = (value) => {
return {
type: actions.SETTING_SET,
value: Object.assign({}, value, {
keymaps: entries,
})
value: { ...value,
keymaps: entries, }
};
};