jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

command as action/reducer

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-09-11 21:07:02 +09:00
parent 14d13e2c3a
commit bf890a6d9d
5 changed files with 71 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/background/index.js
View file

@ -1,51 +1,11 @@
import * as tabs from './tabs';
import * as keys from './keys';
import * as inputActions from '../actions/input';
import backgroundReducers from '../reducers/background';
import commandReducer from '../reducers/command';
import inputReducers from '../reducers/input';
let inputState = inputReducers(undefined, {});
const normalizeUrl = (string) => {
try {
return new URL(string).href
} catch (e) {
return 'http://' + string;
}
}
const cmdBuffer = (sender, arg) => {
if (isNaN(arg)) {
return tabs.selectByKeyword(sender.tab, arg);
} else {
let index = parseInt(arg, 10) - 1;
return tabs.selectAt(index);
}
}
const cmdEnterHandle = (request, sender) => {
let words = request.text.split(' ').filter((s) => s.length > 0);
switch (words[0]) {
case 'open':
return browser.tabs.update(sender.tab.id, { url: normalizeUrl(words[1]) });
case 'tabopen':
return browser.tabs.create({ url: normalizeUrl(words[1]) });
case 'b':
case 'buffer':
return cmdBuffer(sender, words[1]);
}
throw new Error(words[0] + ' command is not defined');
};
browser.runtime.onMessage.addListener((request, sender) => {
switch (request.type) {
case 'event.cmd.enter':
return cmdEnterHandle(request, sender);
default:
return browser.tabs.sendMessage(sender.tab.id, request);
}
});
const keyQueueChanged = (sender, prevState, state) => {
if (state.keys.length === 0) {
return Promise.resolve();
@ -75,7 +35,11 @@ const handleMessage = (action, sender) => {
inputState = nextInputState;
return keyQueueChanged(sender, prevState, inputState);
}
return backgroundReducers(undefined, action, sender);
return backgroundReducers(undefined, action, sender).then(() => {
return commandReducer(undefined, action, sender).then(() => {
return browser.tabs.sendMessage(sender.tab.id, action);
});
});
};
browser.runtime.onMessage.addListener(handleMessage);