From 7d66b42bb026c08214b3a26d7d859048200f3497 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 31 Jul 2018 21:29:52 +0900 Subject: Update eslint --- src/shared/settings/validator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/shared/settings/validator.js b/src/shared/settings/validator.js index 1589420..a800a52 100644 --- a/src/shared/settings/validator.js +++ b/src/shared/settings/validator.js @@ -27,7 +27,7 @@ const validateKeymaps = (keymaps) => { const validateSearch = (search) => { let engines = search.engines; for (let key of Object.keys(engines)) { - if (/\s/.test(key)) { + if ((/\s/).test(key)) { throw new Error( `While space in search engine name is not allowed: "${key}"` ); -- cgit v1.2.3 From ab9183f575d6b220694006d9b155735eaeb275cd Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 2 Aug 2018 20:51:03 +0900 Subject: Fix property document --- src/shared/settings/properties.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/shared/settings/properties.js b/src/shared/settings/properties.js index b392cbb..e8d06da 100644 --- a/src/shared/settings/properties.js +++ b/src/shared/settings/properties.js @@ -16,7 +16,7 @@ const defaults = { }; const docs = { - hintchars: 'Hint characters on follow mode', + hintchars: 'hint characters on follow mode', smoothscroll: 'smooth scroll', adjacenttab: 'open adjacent tabs', }; -- cgit v1.2.3 From db9f4306270f2117fd9def8d3b4eeebef983471d Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 2 Aug 2018 21:35:43 +0900 Subject: Fix error on settings --- src/settings/components/index.jsx | 9 ++++++--- src/settings/reducers/setting.js | 3 +-- test/settings/reducers/setting.test.js | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/settings/components/index.jsx b/src/settings/components/index.jsx index 66dc940..9633359 100644 --- a/src/settings/components/index.jsx +++ b/src/settings/components/index.jsx @@ -68,6 +68,7 @@ class SettingsComponent extends Component { render() { let fields = null; + let disabled = this.props.error.length > 0; if (this.props.source === 'form') { fields = this.renderFormFields(this.props.form); } else if (this.props.source === 'json') { @@ -84,7 +85,8 @@ class SettingsComponent extends Component { label='Use form' checked={this.props.source === 'form'} value='form' - onChange={this.bindSource.bind(this)} /> + onChange={this.bindSource.bind(this)} + disabled={disabled} /> - + onChange={this.bindSource.bind(this)} + disabled={disabled} /> { fields } @@ -128,6 +130,7 @@ class SettingsComponent extends Component { } else if (from === 'json' && to === 'form') { let b = window.confirm(DO_YOU_WANT_TO_CONTINUE); if (!b) { + this.forceUpdate(); return; } this.props.dispatch(settingActions.switchToForm(this.props.json)); diff --git a/src/settings/reducers/setting.js b/src/settings/reducers/setting.js index 8e4a415..54033aa 100644 --- a/src/settings/reducers/setting.js +++ b/src/settings/reducers/setting.js @@ -14,11 +14,10 @@ export default function reducer(state = defaultState, action = {}) { source: action.source, json: action.json, form: action.form, - errors: '', error: '', }; case actions.SETTING_SHOW_ERROR: return { ...state, - error: action.text, + error: action.error, json: action.json, }; case actions.SETTING_SWITCH_TO_FORM: return { ...state, diff --git a/test/settings/reducers/setting.test.js b/test/settings/reducers/setting.test.js index d800394..c1a1648 100644 --- a/test/settings/reducers/setting.test.js +++ b/test/settings/reducers/setting.test.js @@ -25,7 +25,7 @@ describe("settings setting reducer", () => { it('return next state for SETTING_SHOW_ERROR', () => { let action = { type: actions.SETTING_SHOW_ERROR, - text: 'bad value', + error: 'bad value', json: '{}', }; let state = settingReducer(undefined, action); -- cgit v1.2.3 From aa777dd6a2113b4db4ec0bfe13f38369687348bb Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 2 Aug 2018 22:09:14 +0900 Subject: Fix default settings --- src/shared/settings/default.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js index a435099..55dbc3a 100644 --- a/src/shared/settings/default.js +++ b/src/shared/settings/default.js @@ -40,7 +40,7 @@ export default { "zi": { "type": "zoom.in" }, "zo": { "type": "zoom.out" }, "zz": { "type": "zoom.neutral" }, - "f": { "type": "follow.start", "newTab": false, "background": false }, + "f": { "type": "follow.start", "newTab": false }, "F": { "type": "follow.start", "newTab": true, "background": false }, "H": { "type": "navigate.history.prev" }, "L": { "type": "navigate.history.next" }, @@ -70,6 +70,11 @@ export default { } }, "properties": { - } + "hintchars": "abcdefghijklmnopqrstuvwxyz", + "smoothscroll": false, + "adjacenttab": true + }, + "blacklist": [ + ] }`, }; -- cgit v1.2.3 From fddb4914ad3b126cb18395c30eca6be5805460c3 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 5 Aug 2018 21:19:16 +0900 Subject: Use adjacent tab --- src/background/usecases/link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/background/usecases/link.js b/src/background/usecases/link.js index 1339fdf..af152fe 100644 --- a/src/background/usecases/link.js +++ b/src/background/usecases/link.js @@ -15,7 +15,7 @@ export default class LinkInteractor { let settings = await this.settingRepository.get(); let { adjacenttab } = settings.properties; if (adjacenttab) { - return this.tabPresenter.create(url, { + return this.tabPresenter.createAdjacent(url, { openerTabId: openerId, active: !background }); } -- cgit v1.2.3