Merge branch 'some-fix'

jh-changes
Shin'ya Ueoka 7 years ago
commit c2a5a41cb6
  1. 8
      src/actions/operation.js
  2. 2
      src/background/keys.js
  3. 3
      src/content/index.js
  4. 1
      src/operations/index.js

@ -25,11 +25,17 @@ const exec = (operation, tab) => {
case operations.COMMAND_OPEN:
return consoleActions.showCommand('');
case operations.COMMAND_TABS_OPEN:
if (operations.alter) {
if (operation.alter) {
// alter url
return consoleActions.showCommand('open ' + tab.url);
}
return consoleActions.showCommand('open ');
case operations.COMMAND_TABS_NEW:
if (operation.alter) {
// alter url
return consoleActions.showCommand('tabopen ' + tab.url);
}
return consoleActions.showCommand('tabopen ');
case operations.COMMAND_BUFFER:
return consoleActions.showCommand('buffer ');
default:

@ -4,6 +4,8 @@ const defaultKeymap = {
':': { type: operations.COMMAND_OPEN },
'o': { type: operations.COMMAND_TABS_OPEN, alter: false },
'O': { type: operations.COMMAND_TABS_OPEN, alter: true },
't': { type: operations.COMMAND_TABS_NEW, alter: false },
'T': { type: operations.COMMAND_TABS_NEW, alter: true },
'b': { type: operations.COMMAND_BUFFER },
'k': { type: operations.SCROLL_LINES, count: -1 },
'j': { type: operations.SCROLL_LINES, count: 1 },

@ -63,6 +63,9 @@ window.addEventListener('keypress', (e) => {
if (e.target instanceof HTMLInputElement ||
e.target instanceof HTMLTextAreaElement ||
e.target instanceof HTMLSelectElement) {
if (e.key === 'Escape' && e.target.blur) {
e.target.blur();
}
return;
}
browser.runtime.sendMessage({

@ -2,6 +2,7 @@ export default {
// Command
COMMAND_OPEN: 'cmd.open',
COMMAND_TABS_OPEN: 'cmd.tabs.open',
COMMAND_TABS_NEW: 'cmd.tabs.new',
COMMAND_BUFFER: 'cmd.buffer',
SCROLL_LINES: 'scroll.lines',