Cancel following by <C-[>

jh-changes
Shin'ya Ueoka 7 years ago
parent c69fdbb14a
commit 8cc7d472df
  1. 1
      src/content/components/common/follow.js
  2. 8
      src/content/components/top-content/follow-controller.js

@ -63,6 +63,7 @@ export default class Follow {
this.win.parent.postMessage(JSON.stringify({ this.win.parent.postMessage(JSON.stringify({
type: messages.FOLLOW_KEY_PRESS, type: messages.FOLLOW_KEY_PRESS,
key: key.key, key: key.key,
ctrlKey: key.ctrlKey,
}), '*'); }), '*');
return true; return true;
} }

@ -32,7 +32,7 @@ export default class FollowController {
case messages.FOLLOW_RESPONSE_COUNT_TARGETS: case messages.FOLLOW_RESPONSE_COUNT_TARGETS:
return this.create(message.count, sender); return this.create(message.count, sender);
case messages.FOLLOW_KEY_PRESS: case messages.FOLLOW_KEY_PRESS:
return this.keyPress(message.key); return this.keyPress(message.key, message.ctrlKey);
} }
} }
@ -69,7 +69,11 @@ export default class FollowController {
}); });
} }
keyPress(key) { keyPress(key, ctrlKey) {
if (key === '[' && ctrlKey) {
this.store.dispatch(followControllerActions.disable());
return true;
}
switch (key) { switch (key) {
case 'Enter': case 'Enter':
this.activate(); this.activate();