hide console on <Esc> and <C-{>
This commit is contained in:
parent
37410b874f
commit
90b83d7b7b
6 changed files with 18 additions and 2 deletions
|
@ -73,6 +73,10 @@ const exec = (operation, tab) => {
|
||||||
return browser.tabs.sendMessage(tab.id, {
|
return browser.tabs.sendMessage(tab.id, {
|
||||||
type: messages.CONSOLE_SHOW_FIND
|
type: messages.CONSOLE_SHOW_FIND
|
||||||
});
|
});
|
||||||
|
case operations.CANCEL:
|
||||||
|
return browser.tabs.sendMessage(tab.id, {
|
||||||
|
type: messages.CONSOLE_HIDE,
|
||||||
|
});
|
||||||
default:
|
default:
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,17 @@
|
||||||
import actions from 'content/actions';
|
import actions from 'content/actions';
|
||||||
import * as keyUtils from 'shared/utils/keys';
|
import * as keyUtils from 'shared/utils/keys';
|
||||||
|
import operations from 'shared/operations';
|
||||||
|
|
||||||
|
const reservedKeymaps = {
|
||||||
|
'<Esc>': { type: operations.CANCEL },
|
||||||
|
'<C-[>': { type: operations.CANCEL },
|
||||||
|
};
|
||||||
|
|
||||||
const set = (value) => {
|
const set = (value) => {
|
||||||
let entries = [];
|
let entries = [];
|
||||||
if (value.keymaps) {
|
if (value.keymaps) {
|
||||||
entries = Object.entries(value.keymaps).map((entry) => {
|
let keymaps = Object.assign({}, value.keymaps, reservedKeymaps);
|
||||||
|
entries = Object.entries(keymaps).map((entry) => {
|
||||||
return [
|
return [
|
||||||
keyUtils.fromMapKeys(entry[0]),
|
keyUtils.fromMapKeys(entry[0]),
|
||||||
entry[1],
|
entry[1],
|
||||||
|
|
|
@ -32,6 +32,7 @@ export default {
|
||||||
CONSOLE_SHOW_ERROR: 'console.show.error',
|
CONSOLE_SHOW_ERROR: 'console.show.error',
|
||||||
CONSOLE_SHOW_INFO: 'console.show.info',
|
CONSOLE_SHOW_INFO: 'console.show.info',
|
||||||
CONSOLE_SHOW_FIND: 'console.show.find',
|
CONSOLE_SHOW_FIND: 'console.show.find',
|
||||||
|
CONSOLE_HIDE: 'console.hide',
|
||||||
|
|
||||||
FOLLOW_START: 'follow.start',
|
FOLLOW_START: 'follow.start',
|
||||||
FOLLOW_REQUEST_COUNT_TARGETS: 'follow.request.count.targets',
|
FOLLOW_REQUEST_COUNT_TARGETS: 'follow.request.count.targets',
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
export default {
|
export default {
|
||||||
|
// Hide console, or cancel some user actions
|
||||||
|
CANCEL: 'cancel',
|
||||||
|
|
||||||
// Addons
|
// Addons
|
||||||
ADDON_ENABLE: 'addon.enable',
|
ADDON_ENABLE: 'addon.enable',
|
||||||
ADDON_DISABLE: 'addon.disable',
|
ADDON_DISABLE: 'addon.disable',
|
||||||
|
|
|
@ -30,7 +30,6 @@ describe("setting reducer", () => {
|
||||||
};
|
};
|
||||||
state = settingReducer(state, action);
|
state = settingReducer(state, action);
|
||||||
|
|
||||||
console.log(state);
|
|
||||||
expect(state.value.properties).to.have.property('smoothscroll', true);
|
expect(state.value.properties).to.have.property('smoothscroll', true);
|
||||||
expect(state.value.properties).to.have.property('encoding', 'utf-8');
|
expect(state.value.properties).to.have.property('encoding', 'utf-8');
|
||||||
});
|
});
|
||||||
|
|
|
@ -23,6 +23,8 @@ describe("setting actions", () => {
|
||||||
let map = new Map(keymaps);
|
let map = new Map(keymaps);
|
||||||
expect(map).to.have.deep.all.keys(
|
expect(map).to.have.deep.all.keys(
|
||||||
[
|
[
|
||||||
|
[{ key: 'Esc', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false }],
|
||||||
|
[{ key: '[', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false }],
|
||||||
[{ key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
|
[{ key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
|
||||||
{ key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false }],
|
{ key: 'd', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false }],
|
||||||
[{ key: 'z', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
|
[{ key: 'z', shiftKey: false, ctrlKey: false, altKey: false, metaKey: false },
|
||||||
|
|
Reference in a new issue