Merge pull request #596 from ueokande/qa-0.23

QA 0.23

3 files changed, 15 insertions, 6 deletions

diff --git a/src/settings/components/form/SearchForm.tsx b/src/settings/components/form/SearchForm.tsx
index cf78a69..6ba6cfb 100644
--- a/src/settings/components/form/SearchForm.tsx
+++ b/src/settings/components/form/SearchForm.tsx
@@ -54,6 +54,7 @@ class SearchForm extends React.Component<Props> {
     </div>;
   }
 
+  // eslint-disable-next-line max-statements
   bindValue(e: any) {
     let value = this.props.value.toJSON();
     let name = e.target.name;
@@ -72,8 +73,12 @@ class SearchForm extends React.Component<Props> {
       next.default = value.engines[index][0];
     } else if (name === 'add') {
       next.engines.push(['', '']);
-    } else if (name === 'delete') {
+    } else if (name === 'delete' && value.engines.length > 1) {
       next.engines.splice(index, 1);
+      if (value.engines[index][0] === value.default) {
+        let nextIndex = Math.min(index, next.engines.length - 1);
+        next.default = next.engines[nextIndex][0];
+      }
     }
 
     this.props.onChange(FormSearch.valueOf(next));
diff --git a/src/settings/components/index.tsx b/src/settings/components/index.tsx
index b4a0866..eeac2cf 100644
--- a/src/settings/components/index.tsx
+++ b/src/settings/components/index.tsx
@@ -175,6 +175,7 @@ class SettingsComponent extends React.Component<Props> {
     if (from === 'form' && value === 'json') {
       this.props.dispatch(settingActions.switchToJson(
         this.props.form as FormSettings));
+      this.save();
     } else if (from === 'json' && value === 'form') {
       let b = window.confirm(DO_YOU_WANT_TO_CONTINUE);
       if (!b) {
@@ -183,6 +184,7 @@ class SettingsComponent extends React.Component<Props> {
       }
       this.props.dispatch(
         settingActions.switchToForm(this.props.json as JSONSettings));
+      this.save();
     }
   }
 
diff --git a/src/settings/keymaps.ts b/src/settings/keymaps.ts
index e2afa4d..33ad26d 100644
--- a/src/settings/keymaps.ts
+++ b/src/settings/keymaps.ts
@@ -1,3 +1,5 @@
+/* eslint-disable max-len */
+
 const fields = [
   [
     ['scroll.vertically?{"count":1}', 'Scroll down'],
@@ -19,8 +21,8 @@ const fields = [
     ['tabs.close', 'Close a tab'],
     ['tabs.close.right', 'Close tabs to the right'],
     ['tabs.reopen', 'Reopen closed tab'],
-    ['tabs.next?{"count":1}', 'Select next Tab'],
-    ['tabs.prev?{"count":1}', 'Select prev Tab'],
+    ['tabs.next', 'Select next Tab'],
+    ['tabs.prev', 'Select prev Tab'],
     ['tabs.first', 'Select first tab'],
     ['tabs.last', 'Select last tab'],
     ['tabs.reload?{"cache":false}', 'Reload current tab'],
@@ -28,8 +30,8 @@ const fields = [
     ['tabs.pin.toggle', 'Toggle pinned state'],
     ['tabs.duplicate', 'Duplicate a tab'],
   ], [
-    ['follow.start?{"newTab":false}', 'Follow a link'],
-    ['follow.start?{"newTab":true}', 'Follow a link in new tab'],
+    ['follow.start?{"newTab":false,"background":false}', 'Follow a link'],
+    ['follow.start?{"newTab":true,"background":false}', 'Follow a link in new tab'],
     ['navigate.history.prev', 'Go back in histories'],
     ['navigate.history.next', 'Go forward in histories'],
     ['navigate.link.next', 'Open next link'],
@@ -37,7 +39,7 @@ const fields = [
     ['navigate.parent', 'Go to parent directory'],
     ['navigate.root', 'Go to root directory'],
     ['page.source', 'Open page source'],
-    ['page.home', 'Open start page to current tab'],
+    ['page.home?{"newTab":false}', 'Open start page to current tab'],
     ['page.home?{"newTab":true}', 'Open start page in new tab'],
     ['focus.input', 'Focus input'],
   ], [