aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2019-09-05 21:20:39 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2019-09-05 21:36:27 +0900
commitfaba02ec21e9848b1cdf6a6a8bf507500a34290a (patch)
tree1563735f176f7020937adba607f2b491fea0fae6
parent428805e66f993884643136dc2d8267c53bd81588 (diff)
Cancel follow mode and console by Ctrl-C
-rw-r--r--src/console/components/Console.tsx7
-rw-r--r--src/content/InputDriver.ts11
2 files changed, 17 insertions, 1 deletions
diff --git a/src/console/components/Console.tsx b/src/console/components/Console.tsx
index 7da2f36..1743d15 100644
--- a/src/console/components/Console.tsx
+++ b/src/console/components/Console.tsx
@@ -72,6 +72,13 @@ class Console extends React.Component<Props> {
break;
case '[':
if (e.ctrlKey) {
+ e.preventDefault();
+ return this.props.dispatch(consoleActions.hideCommand());
+ }
+ break;
+ case 'c':
+ if (e.ctrlKey) {
+ e.preventDefault();
return this.props.dispatch(consoleActions.hideCommand());
}
break;
diff --git a/src/content/InputDriver.ts b/src/content/InputDriver.ts
index cddc825..ec1f2cc 100644
--- a/src/content/InputDriver.ts
+++ b/src/content/InputDriver.ts
@@ -2,7 +2,16 @@ import * as dom from '../shared/utils/dom';
import Key, * as keys from './domains/Key';
const cancelKey = (e: KeyboardEvent): boolean => {
- return e.key === 'Escape' || e.key === '[' && e.ctrlKey;
+ if (e.key === 'Escape') {
+ return true;
+ }
+ if (e.key === '[' && e.ctrlKey) {
+ return true;
+ }
+ if (e.key === 'c' && e.ctrlKey) {
+ return true;
+ }
+ return false;
};
export default class InputDriver {