From eff7fe276b5a9d50037c7d965712dc24d226a984 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 16:43:17 +0900 Subject: [PATCH 01/18] remove keys --- src/background/keys.js | 28 ------------------ test/background/keys.test.js | 55 ------------------------------------ 2 files changed, 83 deletions(-) delete mode 100644 src/background/keys.js delete mode 100644 test/background/keys.test.js diff --git a/src/background/keys.js b/src/background/keys.js deleted file mode 100644 index 2fd00a2..0000000 --- a/src/background/keys.js +++ /dev/null @@ -1,28 +0,0 @@ -const identifyKey = (key1, key2) => { - return (key1.code === key2.code) && - ((key1.shift || false) === (key2.shift || false)) && - ((key1.ctrl || false) === (key2.ctrl || false)) && - ((key1.alt || false) === (key2.alt || false)) && - ((key1.meta || false) === (key2.meta || false)); -}; - -const hasPrefix = (keys, prefix) => { - if (keys.length < prefix.length) { - return false; - } - for (let i = 0; i < prefix.length; ++i) { - if (!identifyKey(keys[i], prefix[i])) { - return false; - } - } - return true; -} - -const identifyKeys = (keys1, keys2) => { - if (keys1.length !== keys2.length) { - return false; - } - return hasPrefix(keys1, keys2); -} - -export { identifyKey, identifyKeys, hasPrefix }; diff --git a/test/background/keys.test.js b/test/background/keys.test.js deleted file mode 100644 index da9d430..0000000 --- a/test/background/keys.test.js +++ /dev/null @@ -1,55 +0,0 @@ -import { expect } from "chai"; -import { identifyKey, identifyKeys, hasPrefix } from '../../src/background/keys'; - -describe('keys', () => { - describe('#identifyKey', () => { - it('return true if key matched', () => { - expect(identifyKey( - { code: 100 }, - { code: 100 })).to.be.true; - expect(identifyKey( - { code: 100, shift: true, ctrl: true }, - { code: 100, shift: true, ctrl: true })).to.be.true; - expect(identifyKey( - { code: 100, shift: false, ctrl: false }, - { code: 100 })).to.be.true; - }); - - it('return false if key not matched', () => { - expect(identifyKey( - { code: 100 }, - { code: 101 })).to.be.false; - expect(identifyKey( - { code: 100, shift: true, ctrl: true }, - { code: 100, shift: true })).to.be.false; - }); - }); - - describe('#identifyKeys', () => { - it ('return true if keys matched', () => { - let keys = [{ code: 100 }, { code: 101, ctrl: false}]; - let prefix = [{ code: 100, ctrl: false }, { code: 101 }]; - expect(hasPrefix(keys, prefix)).to.be.true; - }); - - it ('return false if keys matched', () => { - let keys = [{ code: 100 }, { code: 101, ctrl: true }]; - let prefix = [{ code: 100 }, { code: 101 }]; - expect(hasPrefix(keys, prefix)).to.be.false; - }); - }); - - describe('#hasPrefix', () => { - it ('return true if prefix matched', () => { - let keys = [{ code: 100 }, { code: 101 }, { code: 102 }]; - let prefix = [{ code: 100 }, { code: 101 }]; - expect(hasPrefix(keys, prefix)).to.be.true; - }); - - it ('return false if prefix not matched', () => { - let keys = [{ code: 100 }, { code: 101 }, { code: 102 }]; - let prefix = [{ code: 102 }]; - expect(hasPrefix(keys, prefix)).to.be.false; - }); - }); -}); From e15de17598b222f16c2eb9c4aa2e47610bc61ed9 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Wed, 6 Sep 2017 21:42:12 +0900 Subject: [PATCH 02/18] use action as object --- src/background/index.js | 12 ++++---- src/background/key-queue.js | 58 ++++++++++++++++++------------------- src/content/index.js | 14 ++++----- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/background/index.js b/src/background/index.js index 8913a83..b2182f0 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -14,9 +14,9 @@ const keyPressHandle = (request, sender) => { return Promise.resolve(); } - if (actions.isBackgroundAction(action[0])) { + if (actions.isBackgroundAction(action.type)) { return doBackgroundAction(sender, action); - } else if (actions.isContentAction(action[0])) { + } else if (actions.isContentAction(action.type)) { return Promise.resolve({ type: 'response.action', action: action @@ -26,17 +26,17 @@ const keyPressHandle = (request, sender) => { }; const doBackgroundAction = (sender, action) => { - switch(action[0]) { + switch(action.type) { case actions.TABS_CLOSE: return tabs.closeTab(sender.tab.id); case actions.TABS_REOPEN: return tabs.reopenTab(); case actions.TABS_PREV: - return tabs.selectPrevTab(sender.tab.index, actions[1] || 1); + return tabs.selectPrevTab(sender.tab.index, action.count); case actions.TABS_NEXT: - return tabs.selectNextTab(sender.tab.index, actions[1] || 1); + return tabs.selectNextTab(sender.tab.index, action.count); case actions.TABS_RELOAD: - return tabs.reload(sender.tab, actions[1] || false); + return tabs.reload(sender.tab, actions.cache); case actions.ZOOM_IN: return zooms.zoomIn(); case actions.ZOOM_OUT: diff --git a/src/background/key-queue.js b/src/background/key-queue.js index d7f0984..b2f5a34 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -1,35 +1,35 @@ import * as actions from '../shared/actions'; const DEFAULT_KEYMAP = { - ':': [ actions.CMD_OPEN ], - 'o': [ actions.CMD_TABS_OPEN, false ], - 'O': [ actions.CMD_TABS_OPEN, true ], - 'b': [ actions.CMD_BUFFER ], - 'k': [ actions.SCROLL_LINES, -1 ], - 'j': [ actions.SCROLL_LINES, 1 ], - '': [ actions.SCROLL_LINES, -1 ], - '': [ actions.SCROLL_LINES, 1 ], - '': [ actions.SCROLL_PAGES, -0.5 ], - '': [ actions.SCROLL_PAGES, 0.5 ], - '': [ actions.SCROLL_PAGES, -1 ], - '': [ actions.SCROLL_PAGES, 1 ], - 'gg': [ actions.SCROLL_TOP ], - 'G': [ actions.SCROLL_BOTTOM ], - '0': [ actions.SCROLL_LEFT ], - '$': [ actions.SCROLL_RIGHT ], - 'd': [ actions.TABS_CLOSE ], - 'u': [ actions.TABS_REOPEN], - 'h': [ actions.TABS_PREV, 1 ], - 'l': [ actions.TABS_NEXT, 1 ], - 'r': [ actions.TABS_RELOAD, false ], - 'R': [ actions.TABS_RELOAD, true ], - 'zi': [ actions.ZOOM_IN ], - 'zo': [ actions.ZOOM_OUT ], - 'zz': [ actions.ZOOM_NEUTRAL], - 'f': [ actions.FOLLOW_START, false ], - 'F': [ actions.FOLLOW_START, true ], - 'H': [ actions.HISTORY_PREV ], - 'L': [ actions.HISTORY_NEXT ], + ':': { type: actions.CMD_OPEN }, + 'o': { type: actions.CMD_TABS_OPEN, alter: false }, + 'O': { type: actions.CMD_TABS_OPEN, alter: true }, + 'b': { type: actions.CMD_BUFFER }, + 'k': { type: actions.SCROLL_LINES, count: -1 }, + 'j': { type: actions.SCROLL_LINES, count: 1 }, + '': { type: actions.SCROLL_LINES, count: -1 }, + '': { type: actions.SCROLL_LINES, count: 1 }, + '': { type: actions.SCROLL_PAGES, count: -0.5 }, + '': { type: actions.SCROLL_PAGES, count: 0.5 }, + '': { type: actions.SCROLL_PAGES, count: -1 }, + '': { type: actions.SCROLL_PAGES, count: 1 }, + 'gg': { type: actions.SCROLL_TOP }, + 'G': { type: actions.SCROLL_BOTTOM }, + '0': { type: actions.SCROLL_LEFT }, + '$': { type: actions.SCROLL_RIGHT }, + 'd': { type: actions.TABS_CLOSE }, + 'u': { type: actions.TABS_REOPEN }, + 'h': { type: actions.TABS_PREV, count: 1 }, + 'l': { type: actions.TABS_NEXT, count: 1 }, + 'r': { type: actions.TABS_RELOAD, cache: false }, + 'R': { type: actions.TABS_RELOAD, cache: true }, + 'zi': { type: actions.ZOOM_IN }, + 'zo': { type: actions.ZOOM_OUT }, + 'zz': { type: actions.ZOOM_NEUTRAL }, + 'f': { type: actions.FOLLOW_START, newTab: false }, + 'F': { type: actions.FOLLOW_START, newTab: true }, + 'H': { type: actions.HISTORY_PREV }, + 'L': { type: actions.HISTORY_NEXT }, } export default class KeyQueue { diff --git a/src/content/index.js b/src/content/index.js index fdc7e89..27dc581 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -8,16 +8,12 @@ import Follow from './follow'; let vvConsole = new ConsoleFrame(window); const doAction = (action) => { - if (typeof action === 'undefined' || action === null) { - return; - } - - switch (action[0]) { + switch (action.type) { case actions.CMD_OPEN: vvConsole.showCommand(''); break; case actions.CMD_TABS_OPEN: - if (action[1] || false) { + if (action.alter) { // alter url vvConsole.showCommand('open ' + window.location.href); } else { @@ -28,10 +24,10 @@ const doAction = (action) => { vvConsole.showCommand('buffer '); break; case actions.SCROLL_LINES: - scrolls.scrollLines(window, action[1]); + scrolls.scrollLines(window, action.count); break; case actions.SCROLL_PAGES: - scrolls.scrollPages(window, action[1]); + scrolls.scrollPages(window, action.count); break; case actions.SCROLL_TOP: scrolls.scrollTop(window); @@ -46,7 +42,7 @@ const doAction = (action) => { scrolls.scrollRight(window); break; case actions.FOLLOW_START: - new Follow(window.document, action[1] || false); + new Follow(window.document, action.newTab); break; case actions.HISTORY_PREV: histories.prev(window); From 3d35db9fc1f1af20867bfc235e962667f8615b6e Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 16:56:31 +0900 Subject: [PATCH 03/18] send message to content instead of response --- src/background/index.js | 5 +---- src/content/index.js | 19 ++++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/background/index.js b/src/background/index.js index b2182f0..171f90e 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -17,10 +17,7 @@ const keyPressHandle = (request, sender) => { if (actions.isBackgroundAction(action.type)) { return doBackgroundAction(sender, action); } else if (actions.isContentAction(action.type)) { - return Promise.resolve({ - type: 'response.action', - action: action - }); + return browser.tabs.sendMessage(sender.tab.id, action); } return Promise.resolve(); }; diff --git a/src/content/index.js b/src/content/index.js index 27dc581..d5cca94 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -7,7 +7,8 @@ import Follow from './follow'; let vvConsole = new ConsoleFrame(window); -const doAction = (action) => { + +browser.runtime.onMessage.addListener((action) => { switch (action.type) { case actions.CMD_OPEN: vvConsole.showCommand(''); @@ -51,19 +52,8 @@ const doAction = (action) => { histories.next(window); break; } -} - -const handleResponse = (response) => { - if (!response) { - return; - } - - switch(response.type) { - case 'response.action': - doAction(response.action); - break; - } -}; + return Promise.resolve(); +}); window.addEventListener("keypress", (e) => { if (e.target instanceof HTMLInputElement) { @@ -77,7 +67,6 @@ window.addEventListener("keypress", (e) => { } browser.runtime.sendMessage(request) - .then(handleResponse) .catch((err) => { console.error("Vim Vixen:", err); vvConsole.showError(err.message); From 0eed357a5e1ceb3061d88ef99a612bb8c4526fa7 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 20:16:51 +0900 Subject: [PATCH 04/18] broadcast an action --- src/background/index.js | 2 ++ src/console/console-frame.js | 2 +- src/console/console.js | 11 ++++++++--- src/content/index.js | 11 ++++------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/background/index.js b/src/background/index.js index 171f90e..61d4895 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -96,5 +96,7 @@ browser.runtime.onMessage.addListener((request, sender) => { items: items }; }); + default: + return browser.tabs.sendMessage(sender.tab.id, request); } }); diff --git a/src/console/console-frame.js b/src/console/console-frame.js index e6bf3f5..a590da9 100644 --- a/src/console/console-frame.js +++ b/src/console/console-frame.js @@ -22,8 +22,8 @@ export default class ConsoleFrame { type: 'vimvixen.console.show.command', text: text }; - messages.send(this.element.contentWindow, message); this.errorShown = false; + return browser.runtime.sendMessage(message); } showError(text) { diff --git a/src/console/console.js b/src/console/console.js index c32eca0..ae05001 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -195,9 +195,6 @@ const selectCompletion = (target) => { messages.receive(window, (message) => { switch (message.type) { - case 'vimvixen.console.show.command': - showCommand(message.text); - break; case 'vimvixen.console.show.error': showError(message.text); break; @@ -206,3 +203,11 @@ messages.receive(window, (message) => { break; } }); + +browser.runtime.onMessage.addListener((action) => { + switch (action.type) { + case 'vimvixen.console.show.command': + return showCommand(action.text); + } + return Promise.resolve(); +}); diff --git a/src/content/index.js b/src/content/index.js index d5cca94..a2a864d 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -11,19 +11,16 @@ let vvConsole = new ConsoleFrame(window); browser.runtime.onMessage.addListener((action) => { switch (action.type) { case actions.CMD_OPEN: - vvConsole.showCommand(''); - break; + return vvConsole.showCommand(''); case actions.CMD_TABS_OPEN: if (action.alter) { // alter url - vvConsole.showCommand('open ' + window.location.href); + return vvConsole.showCommand('open ' + window.location.href); } else { - vvConsole.showCommand('open '); + return vvConsole.showCommand('open '); } - break; case actions.CMD_BUFFER: - vvConsole.showCommand('buffer '); - break; + return vvConsole.showCommand('buffer '); case actions.SCROLL_LINES: scrolls.scrollLines(window, action.count); break; From 6a2bfc51baf22bcf66153076120d48d894a3967d Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 20:25:21 +0900 Subject: [PATCH 05/18] receive message of console --- src/console/console-frame.js | 6 +++--- src/console/console.js | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/console/console-frame.js b/src/console/console-frame.js index a590da9..f07d8ab 100644 --- a/src/console/console-frame.js +++ b/src/console/console-frame.js @@ -1,5 +1,4 @@ import './console-frame.scss'; -import * as messages from '../shared/messages'; export default class ConsoleFrame { constructor(win) { @@ -33,9 +32,10 @@ export default class ConsoleFrame { type: 'vimvixen.console.show.error', text: text }; - messages.send(this.element.contentWindow, message); this.errorShown = true; this.element.blur(); + + return browser.runtime.sendMessage(message); } showFrame() { @@ -53,7 +53,7 @@ export default class ConsoleFrame { } setCompletions(completions) { - messages.send(this.element.contentWindow, { + return browser.runtime.sendMessage({ type: 'vimvixen.console.set.completions', completions: completions }); diff --git a/src/console/console.js b/src/console/console.js index ae05001..23a26ef 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -116,6 +116,8 @@ const showCommand = (text) => { let container = window.document.querySelector('#vimvixen-console-completion'); container.innerHTML = ''; messages.send(parent, keyupMessage(input)); + + return Promise.resolve(); } const showError = (text) => { @@ -128,6 +130,8 @@ const showError = (text) => { let completion = window.document.querySelector('#vimvixen-console-completion'); completion.style.display = 'none'; + + return Promise.resolve(); } const createCompletionTitle = (text) => { @@ -177,6 +181,8 @@ const setCompletions = (completions) => { let input = window.document.querySelector('#vimvixen-console-command-input'); completionOrigin = input.value.split(' ')[0]; + + return Promise.resolve(); } const selectCompletion = (target) => { @@ -193,21 +199,15 @@ const selectCompletion = (target) => { }); }; -messages.receive(window, (message) => { - switch (message.type) { - case 'vimvixen.console.show.error': - showError(message.text); - break; - case 'vimvixen.console.set.completions': - setCompletions(message.completions); - break; - } -}); - browser.runtime.onMessage.addListener((action) => { switch (action.type) { + case 'vimvixen.console.show.error': + return showError(action.text); + case 'vimvixen.console.set.completions': + return setCompletions(action.completions); case 'vimvixen.console.show.command': return showCommand(action.text); + default: + return Promise.resolve(); } - return Promise.resolve(); }); From e6c5aea0748a108fc2c8eccc233130d08a957fb8 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 20:35:15 +0900 Subject: [PATCH 06/18] more broadcast message --- src/console/console.js | 16 +++++----------- src/content/index.js | 18 ++++++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/console/console.js b/src/console/console.js index 23a26ef..006f640 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,8 +1,5 @@ import './console.scss'; import Completion from './completion'; -import * as messages from '../shared/messages'; - -const parent = window.parent; // TODO consider object-oriented var prevValue = ""; @@ -30,7 +27,7 @@ const keyupMessage = (input) => { }; const handleBlur = () => { - messages.send(parent, blurMessage()); + return browser.runtime.sendMessage(blurMessage()); }; const completeNext = () => { @@ -66,11 +63,9 @@ const completePrev = () => { const handleKeydown = (e) => { switch(e.keyCode) { case KeyboardEvent.DOM_VK_ESCAPE: - messages.send(parent, blurMessage()); - break; + return browser.runtime.sendMessage(blurMessage()); case KeyboardEvent.DOM_VK_RETURN: - messages.send(parent, keydownMessage(e.target)); - break; + return browser.runtime.sendMessage(keydownMessage(e.target)); case KeyboardEvent.DOM_VK_TAB: if (e.shiftKey) { completePrev(); @@ -90,8 +85,8 @@ const handleKeyup = (e) => { if (e.target.value === prevValue) { return; } - messages.send(parent, keyupMessage(e.target)); prevValue = e.target.value; + return browser.runtime.sendMessage(keyupMessage(e.target)); }; window.addEventListener('load', () => { @@ -115,9 +110,8 @@ const showCommand = (text) => { completion = null; let container = window.document.querySelector('#vimvixen-console-completion'); container.innerHTML = ''; - messages.send(parent, keyupMessage(input)); - return Promise.resolve(); + return browser.runtime.sendMessage(keyupMessage(input)); } const showError = (text) => { diff --git a/src/content/index.js b/src/content/index.js index a2a864d..bf90363 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -1,7 +1,6 @@ import * as scrolls from './scrolls'; import * as histories from './histories'; import * as actions from '../shared/actions'; -import * as messages from '../shared/messages'; import ConsoleFrame from '../console/console-frame'; import Follow from './follow'; @@ -84,28 +83,27 @@ const doCompletion = (line) => { vvConsole.showError(err.message); }); } + return Promise.resolve(); }; -messages.receive(window, (message) => { - switch (message.type) { +browser.runtime.onMessage.addListener((action) => { + switch (action.type) { case 'vimvixen.command.blur': if (!vvConsole.isErrorShown()) { vvConsole.hide(); } - break; + return Promise.resolve(); case 'vimvixen.command.enter': - browser.runtime.sendMessage({ + return browser.runtime.sendMessage({ type: 'event.cmd.enter', - text: message.value + text: action.value }).catch((err) => { console.error("Vim Vixen:", err); vvConsole.showError(err.message); }); - break; case 'vimvixen.command.change': - doCompletion(message.value); - break; + return doCompletion(action.value); default: - return; + return Promise.resolve(); } }); From 8593b3f5cd0992dd250f5a845c19dc60bbb0bc91 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 20:36:07 +0900 Subject: [PATCH 07/18] remove messages --- src/shared/messages.js | 19 ------------------- test/shared/messages.test.js | 25 ------------------------- 2 files changed, 44 deletions(-) delete mode 100644 src/shared/messages.js delete mode 100644 test/shared/messages.test.js diff --git a/src/shared/messages.js b/src/shared/messages.js deleted file mode 100644 index 517fc4c..0000000 --- a/src/shared/messages.js +++ /dev/null @@ -1,19 +0,0 @@ -const receive = (win, callback) => { - win.addEventListener('message', (e) => { - let message; - try { - message = JSON.parse(e.data); - } catch (e) { - // ignore message posted by author of web page - return; - } - - callback(message); - }) -} - -const send = (win, message) => { - win.postMessage(JSON.stringify(message), '*'); -} - -export { receive, send }; diff --git a/test/shared/messages.test.js b/test/shared/messages.test.js deleted file mode 100644 index 0ebaf1a..0000000 --- a/test/shared/messages.test.js +++ /dev/null @@ -1,25 +0,0 @@ -import { expect } from "chai"; -import * as messages from '../../src/shared/messages'; - -describe('messages', () => { - describe('#receive', () => { - it('received a message', (done) => { - messages.receive(window, (message) => { - expect(message).to.deep.equal({ type: 'vimvixen.test' }); - done(); - }); - window.postMessage(JSON.stringify({ type: 'vimvixen.test' }), '*'); - }); - }); - - describe('#send', () => { - it('sends a message', (done) => { - window.addEventListener('message', (e) => { - let json = JSON.parse(e.data); - expect(json).to.deep.equal({ type: 'vimvixen.test' }); - done(); - }); - messages.send(window, { type: 'vimvixen.test' }); - }); - }); -}); From e8056d2a709df9c9c182382fc7a31795e4dc1c0f Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 22:07:27 +0900 Subject: [PATCH 08/18] console state as action/reducer in redux --- src/actions/console.js | 28 +++++++++ src/actions/index.js | 6 ++ src/console/console-frame.js | 21 ++----- src/console/console.js | 106 +++++++++++++++-------------------- src/content/index.js | 1 - src/reducers/console.js | 39 +++++++++++++ 6 files changed, 123 insertions(+), 78 deletions(-) create mode 100644 src/actions/console.js create mode 100644 src/actions/index.js create mode 100644 src/reducers/console.js diff --git a/src/actions/console.js b/src/actions/console.js new file mode 100644 index 0000000..99a46e8 --- /dev/null +++ b/src/actions/console.js @@ -0,0 +1,28 @@ +import actions from '../actions'; + +export function showCommand(text) { + return { + type: actions.CONSOLE_SHOW_COMMAND, + text: text + }; +} + +export function setCompletions(completions) { + return { + type: actions.CONSOLE_SET_COMPLETIONS, + completions: completions + }; +} + +export function showError(text) { + return { + type: actions.CONSOLE_SHOW_ERROR, + text: text + }; +} + +export function hide() { + return { + type: actions.CONSOLE_HIDE + }; +} diff --git a/src/actions/index.js b/src/actions/index.js new file mode 100644 index 0000000..38ced9d --- /dev/null +++ b/src/actions/index.js @@ -0,0 +1,6 @@ +export default { + CONSOLE_SHOW_COMMAND: 'vimvixen.console.show.command', + CONSOLE_SET_COMPLETIONS: 'vimvixen.console.set.completions', + CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', + CONSOLE_HIDE: 'vimvixen.console.hide' +}; diff --git a/src/console/console-frame.js b/src/console/console-frame.js index f07d8ab..8b4c17a 100644 --- a/src/console/console-frame.js +++ b/src/console/console-frame.js @@ -1,4 +1,5 @@ import './console-frame.scss'; +import * as consoleActions from '../actions/console'; export default class ConsoleFrame { constructor(win) { @@ -16,26 +17,17 @@ export default class ConsoleFrame { showCommand(text) { this.showFrame(); - - let message = { - type: 'vimvixen.console.show.command', - text: text - }; this.errorShown = false; - return browser.runtime.sendMessage(message); + return browser.runtime.sendMessage(consoleActions.showCommand(text)); } showError(text) { this.showFrame(); - let message = { - type: 'vimvixen.console.show.error', - text: text - }; this.errorShown = true; this.element.blur(); - return browser.runtime.sendMessage(message); + return browser.runtime.sendMessage(consoleActions.showError(text)); } showFrame() { @@ -46,6 +38,8 @@ export default class ConsoleFrame { this.element.style.display = 'none'; this.element.blur(); this.errorShown = false; + + return browser.runtime.sendMessage(consoleActions.hide()); } isErrorShown() { @@ -53,9 +47,6 @@ export default class ConsoleFrame { } setCompletions(completions) { - return browser.runtime.sendMessage({ - type: 'vimvixen.console.set.completions', - completions: completions - }); + return browser.runtime.sendMessage(consoleActions.setCompletions(completions)); } } diff --git a/src/console/console.js b/src/console/console.js index 006f640..044aa5f 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,10 +1,12 @@ import './console.scss'; import Completion from './completion'; +import consoleReducer, { defaultState } from '../reducers/console'; // TODO consider object-oriented var prevValue = ""; var completion = null; var completionOrigin = ""; +let state = defaultState; const blurMessage = () => { return { @@ -96,38 +98,6 @@ window.addEventListener('load', () => { input.addEventListener('keyup', handleKeyup); }); -const showCommand = (text) => { - let command = window.document.querySelector('#vimvixen-console-command'); - command.style.display = 'block'; - - let error = window.document.querySelector('#vimvixen-console-error'); - error.style.display = 'none'; - - let input = window.document.querySelector('#vimvixen-console-command-input'); - input.value = text; - input.focus(); - - completion = null; - let container = window.document.querySelector('#vimvixen-console-completion'); - container.innerHTML = ''; - - return browser.runtime.sendMessage(keyupMessage(input)); -} - -const showError = (text) => { - let error = window.document.querySelector('#vimvixen-console-error'); - error.textContent = text; - error.style.display = 'block'; - - let command = window.document.querySelector('#vimvixen-console-command'); - command.style.display = 'none'; - - let completion = window.document.querySelector('#vimvixen-console-completion'); - completion.style.display = 'none'; - - return Promise.resolve(); -} - const createCompletionTitle = (text) => { let li = document.createElement('li'); li.className = 'vimvixen-console-completion-title'; @@ -152,56 +122,68 @@ const createCompletionItem = (icon, caption, url) => { return li; } -const setCompletions = (completions) => { +const selectCompletion = (target) => { let container = window.document.querySelector('#vimvixen-console-completion'); - container.style.display = 'block'; - container.innerHTML = ''; + Array.prototype.forEach.call(container.children, (ele) => { + if (!ele.classList.contains('vimvixen-console-completion-item')) { + return; + } + if (ele === target) { + ele.classList.add('vimvixen-completion-selected'); + } else { + ele.classList.remove('vimvixen-completion-selected'); + } + }); +}; + +const updateCompletions = (completions) => { + let completionsContainer = window.document.querySelector('#vimvixen-console-completion'); + let input = window.document.querySelector('#vimvixen-console-command-input'); + + completionsContainer.innerHTML = ''; let pairs = []; for (let group of completions) { let title = createCompletionTitle(group.name); - container.append(title); + completionsContainer.append(title); for (let item of group.items) { let li = createCompletionItem(item.icon, item.caption, item.url); - container.append(li); + completionsContainer.append(li); pairs.push([item, li]); } } completion = new Completion(pairs); + completionOrigin = input.value.split(' ')[0]; +} +const update = (prevState, state) => { + let error = window.document.querySelector('#vimvixen-console-error'); + let command = window.document.querySelector('#vimvixen-console-command'); let input = window.document.querySelector('#vimvixen-console-command-input'); - completionOrigin = input.value.split(' ')[0]; - return Promise.resolve(); -} + error.style.display = state.errorShown ? 'block' : 'none'; + error.textContent = state.errorText; -const selectCompletion = (target) => { - let container = window.document.querySelector('#vimvixen-console-completion'); - Array.prototype.forEach.call(container.children, (ele) => { - if (!ele.classList.contains('vimvixen-console-completion-item')) { - return; - } - if (ele === target) { - ele.classList.add('vimvixen-completion-selected'); - } else { - ele.classList.remove('vimvixen-completion-selected'); - } - }); -}; + command.style.display = state.commandShown ? 'block' : 'none'; + if (!prevState.commandShown && state.commandShown) { + // setup input on firstly shown + input.value = state.commandText; + input.focus(); + } + + if (JSON.stringify(state.completions) !== JSON.stringify(prevState.completions)) { + updateCompletions(state.completions); + } +} browser.runtime.onMessage.addListener((action) => { - switch (action.type) { - case 'vimvixen.console.show.error': - return showError(action.text); - case 'vimvixen.console.set.completions': - return setCompletions(action.completions); - case 'vimvixen.console.show.command': - return showCommand(action.text); - default: - return Promise.resolve(); + let nextState = consoleReducer(state, action); + if (JSON.stringify(nextState) !== JSON.stringify(state)) { + update(state, nextState); + state = nextState; } }); diff --git a/src/content/index.js b/src/content/index.js index bf90363..deb3506 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -6,7 +6,6 @@ import Follow from './follow'; let vvConsole = new ConsoleFrame(window); - browser.runtime.onMessage.addListener((action) => { switch (action.type) { case actions.CMD_OPEN: diff --git a/src/reducers/console.js b/src/reducers/console.js new file mode 100644 index 0000000..62fc951 --- /dev/null +++ b/src/reducers/console.js @@ -0,0 +1,39 @@ +import actions from '../actions'; + +export const defaultState = { + errorText: '', + errorShown: false, + commandText: '', + commandShown: false, + completions: [], +}; + +export default function reducer(state = defaultState, action = {}) { + switch (action.type) { + case actions.CONSOLE_SHOW_COMMAND: + return Object.assign({}, state, { + commandShown: true, + commandText: action.text, + errorShow: false, + completions: [] + }); + case actions.CONSOLE_SET_COMPLETIONS: + return Object.assign({}, state, { + completions: action.completions + }); + case actions.CONSOLE_SHOW_ERROR: + return Object.assign({}, state, { + errorText: action.message, + errorShow: true, + commandShown: false, + }); + case actions.CONSOLE_HIDE: + return Object.assign({}, state, { + errorShown: false, + commandShown: false + + }); + default: + return state; + } +} From 7e35d11f659029febd738c83b19ab4b8a8b69642 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 22:50:00 +0900 Subject: [PATCH 09/18] add console actions/reducer tests and fix targets --- src/console/console.js | 4 ++-- src/reducers/console.js | 12 +++++----- test/actions/console.test.js | 37 ++++++++++++++++++++++++++++++ test/reducers/console.test.js | 43 +++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 test/actions/console.test.js create mode 100644 test/reducers/console.test.js diff --git a/src/console/console.js b/src/console/console.js index 044aa5f..35d98e0 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,12 +1,12 @@ import './console.scss'; import Completion from './completion'; -import consoleReducer, { defaultState } from '../reducers/console'; +import consoleReducer from '../reducers/console'; // TODO consider object-oriented var prevValue = ""; var completion = null; var completionOrigin = ""; -let state = defaultState; +let state = consoleReducer(undefined, {}); const blurMessage = () => { return { diff --git a/src/reducers/console.js b/src/reducers/console.js index 62fc951..3303802 100644 --- a/src/reducers/console.js +++ b/src/reducers/console.js @@ -1,10 +1,10 @@ import actions from '../actions'; -export const defaultState = { - errorText: '', +const defaultState = { errorShown: false, - commandText: '', + errorText: '', commandShown: false, + commandText: '', completions: [], }; @@ -14,7 +14,7 @@ export default function reducer(state = defaultState, action = {}) { return Object.assign({}, state, { commandShown: true, commandText: action.text, - errorShow: false, + errorShown: false, completions: [] }); case actions.CONSOLE_SET_COMPLETIONS: @@ -23,8 +23,8 @@ export default function reducer(state = defaultState, action = {}) { }); case actions.CONSOLE_SHOW_ERROR: return Object.assign({}, state, { - errorText: action.message, - errorShow: true, + errorText: action.text, + errorShown: true, commandShown: false, }); case actions.CONSOLE_HIDE: diff --git a/test/actions/console.test.js b/test/actions/console.test.js new file mode 100644 index 0000000..512ee40 --- /dev/null +++ b/test/actions/console.test.js @@ -0,0 +1,37 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as consoleActions from '../../src/actions/console'; + +describe("console actions", () => { + describe("showCommand", () => { + it('create CONSOLE_SHOW_COMMAND action', () => { + let action = consoleActions.showCommand('hello'); + expect(action.type).to.equal(actions.CONSOLE_SHOW_COMMAND); + expect(action.text).to.equal('hello'); + }); + }); + + describe("setCompletions", () => { + it('create CONSOLE_SET_COMPLETIONS action', () => { + let action = consoleActions.setCompletions([1,2,3]); + expect(action.type).to.equal(actions.CONSOLE_SET_COMPLETIONS); + expect(action.completions).to.deep.equal([1, 2, 3]); + }); + }); + + describe("showError", () => { + it('create CONSOLE_SHOW_ERROR action', () => { + let action = consoleActions.showError('an error'); + expect(action.type).to.equal(actions.CONSOLE_SHOW_ERROR); + expect(action.text).to.equal('an error'); + }); + }); + + describe("hide", () => { + it('create CONSOLE_HIDE action', () => { + let action = consoleActions.hide(); + expect(action.type).to.equal(actions.CONSOLE_HIDE); + }); + }); +}); + diff --git a/test/reducers/console.test.js b/test/reducers/console.test.js new file mode 100644 index 0000000..9820a08 --- /dev/null +++ b/test/reducers/console.test.js @@ -0,0 +1,43 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import consoleReducer from '../../src/reducers/console'; + +describe("console reducer", () => { + it('return the initial state', () => { + let state = consoleReducer(undefined, {}); + expect(state).to.have.property('errorShown', false); + expect(state).to.have.property('errorText', ''); + expect(state).to.have.property('commandShown', false); + expect(state).to.have.property('commandText', ''); + expect(state).to.have.deep.property('completions', []); + }); + + it('return next state for CONSOLE_SHOW_COMMAND', () => { + let action = { type: actions.CONSOLE_SHOW_COMMAND, text: 'open ' }; + let state = consoleReducer({}, action); + expect(state).to.have.property('commandShown', true); + expect(state).to.have.property('commandText', 'open '); + expect(state).to.have.property('errorShown', false); + }); + + it('return next state for CONSOLE_SET_COMPLETIONS', () => { + let action = { type: actions.CONSOLE_SET_COMPLETIONS, completions: [1, 2, 3] }; + let state = consoleReducer({}, action); + expect(state).to.have.deep.property('completions', [1, 2, 3]); + }); + + it('return next state for CONSOLE_SHOW_ERROR', () => { + let action = { type: actions.CONSOLE_SHOW_ERROR, text: 'an error' }; + let state = consoleReducer({}, action); + expect(state).to.have.property('errorShown', true); + expect(state).to.have.property('errorText', 'an error'); + expect(state).to.have.property('commandShown', false); + }); + + it('return next state for CONSOLE_HIDE', () => { + let action = { type: actions.CONSOLE_HIDE }; + let state = consoleReducer({}, action); + expect(state).to.have.property('errorShown', false); + expect(state).to.have.property('commandShown', false); + }); +}); From 3c67cc0a002aded07e88ea25acc881ff080d1ae4 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 09:20:54 +0900 Subject: [PATCH 10/18] completion as action/reducer --- src/actions/background.js | 11 ++++++++++ src/actions/index.js | 4 +++- src/background/index.js | 20 +++++------------ src/console/console-frame.js | 4 ---- src/console/console.js | 12 ++++------- src/content/index.js | 19 ----------------- src/reducers/background.js | 38 +++++++++++++++++++++++++++++++++ test/actions/background.test.js | 14 ++++++++++++ 8 files changed, 75 insertions(+), 47 deletions(-) create mode 100644 src/actions/background.js create mode 100644 src/reducers/background.js create mode 100644 test/actions/background.test.js diff --git a/src/actions/background.js b/src/actions/background.js new file mode 100644 index 0000000..40b901b --- /dev/null +++ b/src/actions/background.js @@ -0,0 +1,11 @@ +import actions from '../actions'; + +export function requestCompletions(line) { + let command = line.split(' ', 1)[0]; + let keywords = line.replace(command + ' ', ''); + return { + type: actions.BACKGROUND_REQUEST_COMPLETIONS, + command, + keywords + }; +} diff --git a/src/actions/index.js b/src/actions/index.js index 38ced9d..8f22193 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -2,5 +2,7 @@ export default { CONSOLE_SHOW_COMMAND: 'vimvixen.console.show.command', CONSOLE_SET_COMPLETIONS: 'vimvixen.console.set.completions', CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', - CONSOLE_HIDE: 'vimvixen.console.hide' + CONSOLE_HIDE: 'vimvixen.console.hide', + + BACKGROUND_REQUEST_COMPLETIONS: 'vimvixen.background.request.completions' }; diff --git a/src/background/index.js b/src/background/index.js index 61d4895..a80d1ea 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -2,6 +2,7 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; import * as zooms from './zooms'; import KeyQueue from './key-queue'; +import backgroundReducers from '../reducers/background'; const queue = new KeyQueue(); @@ -81,22 +82,11 @@ browser.runtime.onMessage.addListener((request, sender) => { return keyPressHandle(request, sender); case 'event.cmd.enter': return cmdEnterHandle(request, sender); - case 'event.cmd.tabs.completion': - return tabs.getCompletions(request.text).then((tabs) => { - let items = tabs.map((tab) => { - return { - caption: tab.title, - content: tab.title, - url: tab.url, - icon: tab.favIconUrl - } - }); - return { - name: "Buffers", - items: items - }; - }); default: return browser.tabs.sendMessage(sender.tab.id, request); } }); + +browser.runtime.onMessage.addListener((action, sender) => { + return backgroundReducers(undefined, action, sender.tab.id); +}); diff --git a/src/console/console-frame.js b/src/console/console-frame.js index 8b4c17a..063026c 100644 --- a/src/console/console-frame.js +++ b/src/console/console-frame.js @@ -45,8 +45,4 @@ export default class ConsoleFrame { isErrorShown() { return this.element.style.display === 'block' && this.errorShown; } - - setCompletions(completions) { - return browser.runtime.sendMessage(consoleActions.setCompletions(completions)); - } } diff --git a/src/console/console.js b/src/console/console.js index 35d98e0..d79e154 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,4 +1,5 @@ import './console.scss'; +import * as backgroundActions from '../actions/background'; import Completion from './completion'; import consoleReducer from '../reducers/console'; @@ -21,13 +22,6 @@ const keydownMessage = (input) => { }; }; -const keyupMessage = (input) => { - return { - type: 'vimvixen.command.change', - value: input.value - }; -}; - const handleBlur = () => { return browser.runtime.sendMessage(blurMessage()); }; @@ -88,7 +82,9 @@ const handleKeyup = (e) => { return; } prevValue = e.target.value; - return browser.runtime.sendMessage(keyupMessage(e.target)); + return browser.runtime.sendMessage( + backgroundActions.requestCompletions(e.target.value) + ); }; window.addEventListener('load', () => { diff --git a/src/content/index.js b/src/content/index.js index deb3506..1a7fa55 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -68,23 +68,6 @@ window.addEventListener("keypress", (e) => { }); }); -const doCompletion = (line) => { - if (line.startsWith('buffer ')) { - let keyword = line.replace('buffer ', ''); - - browser.runtime.sendMessage({ - type: 'event.cmd.tabs.completion', - text: keyword - }).then((completions) => { - vvConsole.setCompletions([completions]); - }).catch((err) => { - console.error("Vim Vixen:", err); - vvConsole.showError(err.message); - }); - } - return Promise.resolve(); -}; - browser.runtime.onMessage.addListener((action) => { switch (action.type) { case 'vimvixen.command.blur': @@ -100,8 +83,6 @@ browser.runtime.onMessage.addListener((action) => { console.error("Vim Vixen:", err); vvConsole.showError(err.message); }); - case 'vimvixen.command.change': - return doCompletion(action.value); default: return Promise.resolve(); } diff --git a/src/reducers/background.js b/src/reducers/background.js new file mode 100644 index 0000000..eccc8ca --- /dev/null +++ b/src/reducers/background.js @@ -0,0 +1,38 @@ +import * as tabs from '../background/tabs'; +import * as consoleActions from '../actions/console'; +import actions from '../actions'; + +const doCompletion = (command, keywords, sendto) => { + if (command === 'buffer') { + return tabs.getCompletions(keywords).then((tabs) => { + let items = tabs.map((tab) => { + return { + caption: tab.title, + content: tab.title, + url: tab.url, + icon: tab.favIconUrl + } + }); + let completions = { + name: "Buffers", + items: items + }; + return browser.tabs.sendMessage( + sendto, + consoleActions.setCompletions([completions])); + }); + } + return Promise.resolve(); +}; + + + +export default function reducer(state, action = {}, sendto) { + // TODO hide sendto object + switch (action.type) { + case actions.BACKGROUND_REQUEST_COMPLETIONS: + return doCompletion(action.command, action.keywords, sendto); + default: + return Promise.resolve(); + } +} diff --git a/test/actions/background.test.js b/test/actions/background.test.js new file mode 100644 index 0000000..a3203ee --- /dev/null +++ b/test/actions/background.test.js @@ -0,0 +1,14 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as backgroundActions from '../../src/actions/background'; + +describe("background actions", () => { + describe("requestCompletions", () => { + it('create BACKGROUND_REQUEST_COMPLETIONS action', () => { + let action = backgroundActions.requestCompletions('buffer hoge fuga'); + expect(action.type).to.equal(actions.BACKGROUND_REQUEST_COMPLETIONS); + expect(action.command).to.equal('buffer'); + expect(action.keywords).to.equal('hoge fuga'); + }); + }); +}); From 359fdb528821844f3c2fda718b82ce229a64b29f Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 15:49:51 +0900 Subject: [PATCH 11/18] blur as action/reducer --- src/console/console-frame.js | 48 ------------------------------------ src/console/console.js | 17 +++++++------ src/console/frames.js | 27 ++++++++++++++++++++ src/content/index.js | 26 +++++++++---------- 4 files changed, 49 insertions(+), 69 deletions(-) delete mode 100644 src/console/console-frame.js create mode 100644 src/console/frames.js diff --git a/src/console/console-frame.js b/src/console/console-frame.js deleted file mode 100644 index 063026c..0000000 --- a/src/console/console-frame.js +++ /dev/null @@ -1,48 +0,0 @@ -import './console-frame.scss'; -import * as consoleActions from '../actions/console'; - -export default class ConsoleFrame { - constructor(win) { - let element = window.document.createElement('iframe'); - element.src = browser.runtime.getURL('build/console.html'); - element.className = 'vimvixen-console-frame'; - win.document.body.append(element); - - this.element = element; - - this.errorShown = true; - - this.hide(); - } - - showCommand(text) { - this.showFrame(); - this.errorShown = false; - return browser.runtime.sendMessage(consoleActions.showCommand(text)); - } - - showError(text) { - this.showFrame(); - - this.errorShown = true; - this.element.blur(); - - return browser.runtime.sendMessage(consoleActions.showError(text)); - } - - showFrame() { - this.element.style.display = 'block'; - } - - hide() { - this.element.style.display = 'none'; - this.element.blur(); - this.errorShown = false; - - return browser.runtime.sendMessage(consoleActions.hide()); - } - - isErrorShown() { - return this.element.style.display === 'block' && this.errorShown; - } -} diff --git a/src/console/console.js b/src/console/console.js index d79e154..f83f79c 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,5 +1,6 @@ import './console.scss'; import * as backgroundActions from '../actions/background'; +import * as consoleActions from '../actions/console'; import Completion from './completion'; import consoleReducer from '../reducers/console'; @@ -9,12 +10,6 @@ var completion = null; var completionOrigin = ""; let state = consoleReducer(undefined, {}); -const blurMessage = () => { - return { - type: 'vimvixen.command.blur' - }; -}; - const keydownMessage = (input) => { return { type: 'vimvixen.command.enter', @@ -23,7 +18,7 @@ const keydownMessage = (input) => { }; const handleBlur = () => { - return browser.runtime.sendMessage(blurMessage()); + return browser.runtime.sendMessage(consoleActions.hide()); }; const completeNext = () => { @@ -57,9 +52,11 @@ const completePrev = () => { } const handleKeydown = (e) => { + let input = window.document.querySelector('#vimvixen-console-command-input'); + switch(e.keyCode) { case KeyboardEvent.DOM_VK_ESCAPE: - return browser.runtime.sendMessage(blurMessage()); + return input.blur(); case KeyboardEvent.DOM_VK_RETURN: return browser.runtime.sendMessage(keydownMessage(e.target)); case KeyboardEvent.DOM_VK_TAB: @@ -183,3 +180,7 @@ browser.runtime.onMessage.addListener((action) => { state = nextState; } }); + +window.addEventListener('load', () => { + update({}, state); +}); diff --git a/src/console/frames.js b/src/console/frames.js new file mode 100644 index 0000000..0b6f3e2 --- /dev/null +++ b/src/console/frames.js @@ -0,0 +1,27 @@ +import './console-frame.scss'; +import * as consoleActions from '../actions/console'; + +const initialize = (doc) => { + let iframe = doc.createElement('iframe'); + iframe.src = browser.runtime.getURL('build/console.html'); + iframe.id = 'vimvixen-console-frame'; + iframe.className = 'vimvixen-console-frame'; + doc.body.append(iframe); + + return iframe; +} + +const showCommand = (text) => { + return browser.runtime.sendMessage(consoleActions.showCommand(text)); +}; + +const showError = (text) => { + return browser.runtime.sendMessage(consoleActions.showError(text)); +} + +const blur = (doc) => { + let iframe = doc.getElementById('vimvixen-console-frame'); + iframe.blur(); +} + +export { initialize, showCommand, showError, blur }; diff --git a/src/content/index.js b/src/content/index.js index 1a7fa55..4fba516 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -1,24 +1,26 @@ +import '../console/console-frame.scss'; import * as scrolls from './scrolls'; import * as histories from './histories'; import * as actions from '../shared/actions'; -import ConsoleFrame from '../console/console-frame'; +import * as consoleFrames from '../console/frames'; +import actionTypes from '../actions'; import Follow from './follow'; -let vvConsole = new ConsoleFrame(window); +consoleFrames.initialize(window.document); browser.runtime.onMessage.addListener((action) => { switch (action.type) { case actions.CMD_OPEN: - return vvConsole.showCommand(''); + return consoleFrames.showCommand(''); case actions.CMD_TABS_OPEN: if (action.alter) { // alter url - return vvConsole.showCommand('open ' + window.location.href); + return consoleFrames.showCommand('open ' + window.location.href); } else { - return vvConsole.showCommand('open '); + return consoleFrames.showCommand('open '); } case actions.CMD_BUFFER: - return vvConsole.showCommand('buffer '); + return consoleFrames.showCommand('buffer '); case actions.SCROLL_LINES: scrolls.scrollLines(window, action.count); break; @@ -64,24 +66,22 @@ window.addEventListener("keypress", (e) => { browser.runtime.sendMessage(request) .catch((err) => { console.error("Vim Vixen:", err); - vvConsole.showError(err.message); + return consoleFrames.showError(err.message); }); }); browser.runtime.onMessage.addListener((action) => { switch (action.type) { - case 'vimvixen.command.blur': - if (!vvConsole.isErrorShown()) { - vvConsole.hide(); - } - return Promise.resolve(); + case actionTypes.CONSOLE_HIDE: + window.focus(); + return consoleFrames.blur(window.document); case 'vimvixen.command.enter': return browser.runtime.sendMessage({ type: 'event.cmd.enter', text: action.value }).catch((err) => { console.error("Vim Vixen:", err); - vvConsole.showError(err.message); + return consoleFrames.showError(err.message); }); default: return Promise.resolve(); From 2c40d239f0962f1442f357c0697e4c8aa2eafd31 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 17:27:55 +0900 Subject: [PATCH 12/18] background command from reducer --- src/actions/index.js | 11 ++++++++++- src/background/index.js | 32 ++++---------------------------- src/background/key-queue.js | 19 ++++++++++--------- src/reducers/background.js | 29 ++++++++++++++++++++++------- src/shared/actions.js | 23 ----------------------- 5 files changed, 46 insertions(+), 68 deletions(-) diff --git a/src/actions/index.js b/src/actions/index.js index 8f22193..bc44fec 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -4,5 +4,14 @@ export default { CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', CONSOLE_HIDE: 'vimvixen.console.hide', - BACKGROUND_REQUEST_COMPLETIONS: 'vimvixen.background.request.completions' + BACKGROUND_REQUEST_COMPLETIONS: 'vimvixen.background.request.completions', + + TABS_CLOSE: 'tabs.close', + TABS_REOPEN: 'tabs.reopen', + TABS_PREV: 'tabs.prev', + TABS_NEXT: 'tabs.next', + TABS_RELOAD: 'tabs.reload', + ZOOM_IN: 'zoom.in', + ZOOM_OUT: 'zoom.out', + ZOOM_NEUTRAL: 'zoom.neutral', }; diff --git a/src/background/index.js b/src/background/index.js index a80d1ea..cb7a3ff 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,6 +1,5 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; -import * as zooms from './zooms'; import KeyQueue from './key-queue'; import backgroundReducers from '../reducers/background'; @@ -15,36 +14,13 @@ const keyPressHandle = (request, sender) => { return Promise.resolve(); } - if (actions.isBackgroundAction(action.type)) { - return doBackgroundAction(sender, action); - } else if (actions.isContentAction(action.type)) { + if (actions.isContentAction(action.type)) { return browser.tabs.sendMessage(sender.tab.id, action); + } else { + return backgroundReducers(undefined, action, sender); } - return Promise.resolve(); }; -const doBackgroundAction = (sender, action) => { - switch(action.type) { - case actions.TABS_CLOSE: - return tabs.closeTab(sender.tab.id); - case actions.TABS_REOPEN: - return tabs.reopenTab(); - case actions.TABS_PREV: - return tabs.selectPrevTab(sender.tab.index, action.count); - case actions.TABS_NEXT: - return tabs.selectNextTab(sender.tab.index, action.count); - case actions.TABS_RELOAD: - return tabs.reload(sender.tab, actions.cache); - case actions.ZOOM_IN: - return zooms.zoomIn(); - case actions.ZOOM_OUT: - return zooms.zoomOut(); - case actions.ZOOM_NEUTRAL: - return zooms.neutral(); - } - return Promise.resolve(); -} - const normalizeUrl = (string) => { try { return new URL(string).href @@ -88,5 +64,5 @@ browser.runtime.onMessage.addListener((request, sender) => { }); browser.runtime.onMessage.addListener((action, sender) => { - return backgroundReducers(undefined, action, sender.tab.id); + return backgroundReducers(undefined, action, sender); }); diff --git a/src/background/key-queue.js b/src/background/key-queue.js index b2f5a34..25f1d24 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -1,3 +1,4 @@ +import newActions from '../actions'; import * as actions from '../shared/actions'; const DEFAULT_KEYMAP = { @@ -17,15 +18,15 @@ const DEFAULT_KEYMAP = { 'G': { type: actions.SCROLL_BOTTOM }, '0': { type: actions.SCROLL_LEFT }, '$': { type: actions.SCROLL_RIGHT }, - 'd': { type: actions.TABS_CLOSE }, - 'u': { type: actions.TABS_REOPEN }, - 'h': { type: actions.TABS_PREV, count: 1 }, - 'l': { type: actions.TABS_NEXT, count: 1 }, - 'r': { type: actions.TABS_RELOAD, cache: false }, - 'R': { type: actions.TABS_RELOAD, cache: true }, - 'zi': { type: actions.ZOOM_IN }, - 'zo': { type: actions.ZOOM_OUT }, - 'zz': { type: actions.ZOOM_NEUTRAL }, + 'd': { type: newActions.TABS_CLOSE }, + 'u': { type: newActions.TABS_REOPEN }, + 'h': { type: newActions.TABS_PREV, count: 1 }, + 'l': { type: newActions.TABS_NEXT, count: 1 }, + 'r': { type: newActions.TABS_RELOAD, cache: false }, + 'R': { type: newActions.TABS_RELOAD, cache: true }, + 'zi': { type: newActions.ZOOM_IN }, + 'zo': { type: newActions.ZOOM_OUT }, + 'zz': { type: newActions.ZOOM_NEUTRAL }, 'f': { type: actions.FOLLOW_START, newTab: false }, 'F': { type: actions.FOLLOW_START, newTab: true }, 'H': { type: actions.HISTORY_PREV }, diff --git a/src/reducers/background.js b/src/reducers/background.js index eccc8ca..d7d7860 100644 --- a/src/reducers/background.js +++ b/src/reducers/background.js @@ -1,8 +1,9 @@ import * as tabs from '../background/tabs'; +import * as zooms from '../background/zooms'; import * as consoleActions from '../actions/console'; import actions from '../actions'; -const doCompletion = (command, keywords, sendto) => { +const doCompletion = (command, keywords, sender) => { if (command === 'buffer') { return tabs.getCompletions(keywords).then((tabs) => { let items = tabs.map((tab) => { @@ -18,20 +19,34 @@ const doCompletion = (command, keywords, sendto) => { items: items }; return browser.tabs.sendMessage( - sendto, + sender, consoleActions.setCompletions([completions])); }); } return Promise.resolve(); }; - - -export default function reducer(state, action = {}, sendto) { - // TODO hide sendto object +export default function reducer(state, action = {}, sender) { + // TODO hide sender object switch (action.type) { case actions.BACKGROUND_REQUEST_COMPLETIONS: - return doCompletion(action.command, action.keywords, sendto); + return doCompletion(action.command, action.keywords, sender.tab.id); + case actions.TABS_CLOSE: + return tabs.closeTab(sender.tab.id); + case actions.TABS_REOPEN: + return tabs.reopenTab(); + case actions.TABS_PREV: + return tabs.selectPrevTab(sender.tab.index, action.count); + case actions.TABS_NEXT: + return tabs.selectNextTab(sender.tab.index, action.count); + case actions.TABS_RELOAD: + return tabs.reload(sender.tab, action.cache); + case actions.ZOOM_IN: + return zooms.zoomIn(); + case actions.ZOOM_OUT: + return zooms.zoomOut(); + case actions.ZOOM_NEUTRAL: + return zooms.neutral(); default: return Promise.resolve(); } diff --git a/src/shared/actions.js b/src/shared/actions.js index 7151dd1..5163cf3 100644 --- a/src/shared/actions.js +++ b/src/shared/actions.js @@ -1,11 +1,6 @@ export const CMD_OPEN = 'cmd.open'; export const CMD_TABS_OPEN = 'cmd.tabs.open'; export const CMD_BUFFER = 'cmd.buffer'; -export const TABS_CLOSE = 'tabs.close'; -export const TABS_REOPEN = 'tabs.reopen'; -export const TABS_PREV = 'tabs.prev'; -export const TABS_NEXT = 'tabs.next'; -export const TABS_RELOAD = 'tabs.reload'; export const SCROLL_LINES = 'scroll.lines'; export const SCROLL_PAGES = 'scroll.pages'; export const SCROLL_TOP = 'scroll.top'; @@ -15,20 +10,6 @@ export const SCROLL_RIGHT= 'scroll.right'; export const FOLLOW_START = 'follow.start'; export const HISTORY_PREV = 'history.prev'; export const HISTORY_NEXT = 'history.next'; -export const ZOOM_IN = 'zoom.in'; -export const ZOOM_OUT = 'zoom.out'; -export const ZOOM_NEUTRAL = 'zoom.neutral'; - -const BACKGROUND_ACTION_SET = new Set([ - TABS_CLOSE, - TABS_REOPEN, - TABS_PREV, - TABS_NEXT, - TABS_RELOAD, - ZOOM_IN, - ZOOM_OUT, - ZOOM_NEUTRAL -]); const CONTENT_ACTION_SET = new Set([ CMD_OPEN, @@ -45,10 +26,6 @@ const CONTENT_ACTION_SET = new Set([ HISTORY_NEXT ]); -export const isBackgroundAction = (action) => { - return BACKGROUND_ACTION_SET.has(action); -}; - export const isContentAction = (action) => { return CONTENT_ACTION_SET.has(action); }; From adc6a5175c0d8b83e45b9e8d99109c1605ad29ac Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 17:51:25 +0900 Subject: [PATCH 13/18] content commands as action/reducer --- src/actions/index.js | 17 ++++++++++++- src/background/index.js | 7 ++---- src/background/key-queue.js | 21 ++++++++-------- src/content/index.js | 50 +++---------------------------------- src/reducers/content.js | 48 +++++++++++++++++++++++++++++++++++ src/shared/actions.js | 31 ----------------------- 6 files changed, 80 insertions(+), 94 deletions(-) create mode 100644 src/reducers/content.js delete mode 100644 src/shared/actions.js diff --git a/src/actions/index.js b/src/actions/index.js index bc44fec..de3ab42 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -1,11 +1,12 @@ export default { + // console commands CONSOLE_SHOW_COMMAND: 'vimvixen.console.show.command', CONSOLE_SET_COMPLETIONS: 'vimvixen.console.set.completions', CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', CONSOLE_HIDE: 'vimvixen.console.hide', + // Background commands BACKGROUND_REQUEST_COMPLETIONS: 'vimvixen.background.request.completions', - TABS_CLOSE: 'tabs.close', TABS_REOPEN: 'tabs.reopen', TABS_PREV: 'tabs.prev', @@ -14,4 +15,18 @@ export default { ZOOM_IN: 'zoom.in', ZOOM_OUT: 'zoom.out', ZOOM_NEUTRAL: 'zoom.neutral', + + // content commands + CMD_OPEN: 'cmd.open', + CMD_TABS_OPEN: 'cmd.tabs.open', + CMD_BUFFER: 'cmd.buffer', + SCROLL_LINES: 'scroll.lines', + SCROLL_PAGES: 'scroll.pages', + SCROLL_TOP: 'scroll.top', + SCROLL_BOTTOM: 'scroll.bottom', + SCROLL_LEFT: 'scroll.left', + SCROLL_RIGHT: 'scroll.right', + FOLLOW_START: 'follow.start', + HISTORY_PREV: 'history.prev', + HISTORY_NEXT: 'history.next', }; diff --git a/src/background/index.js b/src/background/index.js index cb7a3ff..3fa8553 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,4 +1,3 @@ -import * as actions from '../shared/actions'; import * as tabs from './tabs'; import KeyQueue from './key-queue'; import backgroundReducers from '../reducers/background'; @@ -14,11 +13,9 @@ const keyPressHandle = (request, sender) => { return Promise.resolve(); } - if (actions.isContentAction(action.type)) { + return backgroundReducers(undefined, action, sender).then(() => { return browser.tabs.sendMessage(sender.tab.id, action); - } else { - return backgroundReducers(undefined, action, sender); - } + }); }; const normalizeUrl = (string) => { diff --git a/src/background/key-queue.js b/src/background/key-queue.js index 25f1d24..924bf77 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -1,5 +1,4 @@ -import newActions from '../actions'; -import * as actions from '../shared/actions'; +import actions from '../actions'; const DEFAULT_KEYMAP = { ':': { type: actions.CMD_OPEN }, @@ -18,15 +17,15 @@ const DEFAULT_KEYMAP = { 'G': { type: actions.SCROLL_BOTTOM }, '0': { type: actions.SCROLL_LEFT }, '$': { type: actions.SCROLL_RIGHT }, - 'd': { type: newActions.TABS_CLOSE }, - 'u': { type: newActions.TABS_REOPEN }, - 'h': { type: newActions.TABS_PREV, count: 1 }, - 'l': { type: newActions.TABS_NEXT, count: 1 }, - 'r': { type: newActions.TABS_RELOAD, cache: false }, - 'R': { type: newActions.TABS_RELOAD, cache: true }, - 'zi': { type: newActions.ZOOM_IN }, - 'zo': { type: newActions.ZOOM_OUT }, - 'zz': { type: newActions.ZOOM_NEUTRAL }, + 'd': { type: actions.TABS_CLOSE }, + 'u': { type: actions.TABS_REOPEN }, + 'h': { type: actions.TABS_PREV, count: 1 }, + 'l': { type: actions.TABS_NEXT, count: 1 }, + 'r': { type: actions.TABS_RELOAD, cache: false }, + 'R': { type: actions.TABS_RELOAD, cache: true }, + 'zi': { type: actions.ZOOM_IN }, + 'zo': { type: actions.ZOOM_OUT }, + 'zz': { type: actions.ZOOM_NEUTRAL }, 'f': { type: actions.FOLLOW_START, newTab: false }, 'F': { type: actions.FOLLOW_START, newTab: true }, 'H': { type: actions.HISTORY_PREV }, diff --git a/src/content/index.js b/src/content/index.js index 4fba516..314dfea 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -1,54 +1,12 @@ import '../console/console-frame.scss'; -import * as scrolls from './scrolls'; -import * as histories from './histories'; -import * as actions from '../shared/actions'; import * as consoleFrames from '../console/frames'; -import actionTypes from '../actions'; -import Follow from './follow'; +import actions from '../actions'; +import contentReducer from '../reducers/content'; consoleFrames.initialize(window.document); browser.runtime.onMessage.addListener((action) => { - switch (action.type) { - case actions.CMD_OPEN: - return consoleFrames.showCommand(''); - case actions.CMD_TABS_OPEN: - if (action.alter) { - // alter url - return consoleFrames.showCommand('open ' + window.location.href); - } else { - return consoleFrames.showCommand('open '); - } - case actions.CMD_BUFFER: - return consoleFrames.showCommand('buffer '); - case actions.SCROLL_LINES: - scrolls.scrollLines(window, action.count); - break; - case actions.SCROLL_PAGES: - scrolls.scrollPages(window, action.count); - break; - case actions.SCROLL_TOP: - scrolls.scrollTop(window); - break; - case actions.SCROLL_BOTTOM: - scrolls.scrollBottom(window); - break; - case actions.SCROLL_LEFT: - scrolls.scrollLeft(window); - break; - case actions.SCROLL_RIGHT: - scrolls.scrollRight(window); - break; - case actions.FOLLOW_START: - new Follow(window.document, action.newTab); - break; - case actions.HISTORY_PREV: - histories.prev(window); - break; - case actions.HISTORY_NEXT: - histories.next(window); - break; - } + contentReducer(undefined, action); return Promise.resolve(); }); @@ -72,7 +30,7 @@ window.addEventListener("keypress", (e) => { browser.runtime.onMessage.addListener((action) => { switch (action.type) { - case actionTypes.CONSOLE_HIDE: + case actions.CONSOLE_HIDE: window.focus(); return consoleFrames.blur(window.document); case 'vimvixen.command.enter': diff --git a/src/reducers/content.js b/src/reducers/content.js new file mode 100644 index 0000000..bcf1160 --- /dev/null +++ b/src/reducers/content.js @@ -0,0 +1,48 @@ +import * as consoleFrames from '../console/frames'; +import * as histories from '../content/histories'; +import * as scrolls from '../content/scrolls'; +import Follow from '../content/follow'; +import actions from '../actions'; + +export default function reducer(state, action = {}) { + switch (action.type) { + case actions.CMD_OPEN: + return consoleFrames.showCommand(''); + case actions.CMD_TABS_OPEN: + if (action.alter) { + // alter url + return consoleFrames.showCommand('open ' + window.location.href); + } else { + return consoleFrames.showCommand('open '); + } + case actions.CMD_BUFFER: + return consoleFrames.showCommand('buffer '); + case actions.SCROLL_LINES: + scrolls.scrollLines(window, action.count); + break; + case actions.SCROLL_PAGES: + scrolls.scrollPages(window, action.count); + break; + case actions.SCROLL_TOP: + scrolls.scrollTop(window); + break; + case actions.SCROLL_BOTTOM: + scrolls.scrollBottom(window); + break; + case actions.SCROLL_LEFT: + scrolls.scrollLeft(window); + break; + case actions.SCROLL_RIGHT: + scrolls.scrollRight(window); + break; + case actions.FOLLOW_START: + new Follow(window.document, action.newTab); + break; + case actions.HISTORY_PREV: + histories.prev(window); + break; + case actions.HISTORY_NEXT: + histories.next(window); + break; + } +} diff --git a/src/shared/actions.js b/src/shared/actions.js deleted file mode 100644 index 5163cf3..0000000 --- a/src/shared/actions.js +++ /dev/null @@ -1,31 +0,0 @@ -export const CMD_OPEN = 'cmd.open'; -export const CMD_TABS_OPEN = 'cmd.tabs.open'; -export const CMD_BUFFER = 'cmd.buffer'; -export const SCROLL_LINES = 'scroll.lines'; -export const SCROLL_PAGES = 'scroll.pages'; -export const SCROLL_TOP = 'scroll.top'; -export const SCROLL_BOTTOM = 'scroll.bottom'; -export const SCROLL_LEFT= 'scroll.left'; -export const SCROLL_RIGHT= 'scroll.right'; -export const FOLLOW_START = 'follow.start'; -export const HISTORY_PREV = 'history.prev'; -export const HISTORY_NEXT = 'history.next'; - -const CONTENT_ACTION_SET = new Set([ - CMD_OPEN, - CMD_TABS_OPEN, - CMD_BUFFER, - SCROLL_LINES, - SCROLL_PAGES, - SCROLL_TOP, - SCROLL_BOTTOM, - SCROLL_LEFT, - SCROLL_RIGHT, - FOLLOW_START, - HISTORY_PREV, - HISTORY_NEXT -]); - -export const isContentAction = (action) => { - return CONTENT_ACTION_SET.has(action); -}; From 879b5afe66ee79424c3ffee3951ef1c0b8c86eaa Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 21:28:00 +0900 Subject: [PATCH 14/18] key input sequence as action/reducer --- src/actions/index.js | 4 ++ src/actions/input.js | 15 ++++++ src/background/index.js | 56 +++++++++++++------- src/background/{key-queue.js => keys.js} | 67 ++++++++---------------- src/background/tabs.js | 4 +- src/content/index.js | 10 +--- src/reducers/input.js | 23 ++++++++ test/background/key-queue.test.js | 50 ------------------ test/background/keys.test.js | 31 +++++++++++ 9 files changed, 134 insertions(+), 126 deletions(-) create mode 100644 src/actions/input.js rename src/background/{key-queue.js => keys.js} (57%) create mode 100644 src/reducers/input.js delete mode 100644 test/background/key-queue.test.js create mode 100644 test/background/keys.test.js diff --git a/src/actions/index.js b/src/actions/index.js index de3ab42..135dd4a 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -29,4 +29,8 @@ export default { FOLLOW_START: 'follow.start', HISTORY_PREV: 'history.prev', HISTORY_NEXT: 'history.next', + + // User input + INPUT_KEY_PRESS: 'input.key,press', + INPUT_CLEAR_KEYS: 'input.clear.keys', }; diff --git a/src/actions/input.js b/src/actions/input.js new file mode 100644 index 0000000..c72b9e0 --- /dev/null +++ b/src/actions/input.js @@ -0,0 +1,15 @@ +import actions from '../actions'; + +export function keyPress(code, ctrl) { + return { + type: actions.INPUT_KEY_PRESS, + code, + ctrl + }; +} + +export function clearKeys() { + return { + type: actions.INPUT_CLEAR_KEYS + } +} diff --git a/src/background/index.js b/src/background/index.js index 3fa8553..4d75b33 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,22 +1,10 @@ import * as tabs from './tabs'; -import KeyQueue from './key-queue'; +import * as keys from './keys'; +import * as inputActions from '../actions/input'; import backgroundReducers from '../reducers/background'; +import inputReducers from '../reducers/input'; -const queue = new KeyQueue(); - -const keyPressHandle = (request, sender) => { - let action = queue.push({ - code: request.code, - ctrl: request.ctrl - }); - if (!action) { - return Promise.resolve(); - } - - return backgroundReducers(undefined, action, sender).then(() => { - return browser.tabs.sendMessage(sender.tab.id, action); - }); -}; +let inputState = inputReducers(undefined, {}); const normalizeUrl = (string) => { try { @@ -51,8 +39,6 @@ const cmdEnterHandle = (request, sender) => { browser.runtime.onMessage.addListener((request, sender) => { switch (request.type) { - case 'event.keypress': - return keyPressHandle(request, sender); case 'event.cmd.enter': return cmdEnterHandle(request, sender); default: @@ -60,6 +46,36 @@ browser.runtime.onMessage.addListener((request, sender) => { } }); -browser.runtime.onMessage.addListener((action, sender) => { +const keyQueueChanged = (sender, prevState, state) => { + if (state.keys.length === 0) { + return Promise.resolve(); + } + + let prefix = keys.asKeymapChars(state.keys); + let matched = Object.keys(keys.defaultKeymap).filter((keys) => { + return keys.startsWith(prefix); + }); + if (matched.length == 0) { + return handleMessage(inputActions.clearKeys(), sender); + } else if (matched.length > 1 || matched.length === 1 && prefix !== matched[0]) { + return Promise.resolve(); + } + let action = keys.defaultKeymap[matched]; + return handleMessage(inputActions.clearKeys(), sender).then(() => { + return backgroundReducers(undefined, action, sender).then(() => { + return browser.tabs.sendMessage(sender.tab.id, action); + }); + }); +}; + +const handleMessage = (action, sender) => { + let nextInputState = inputReducers(inputState, action); + if (JSON.stringify(nextInputState) !== JSON.stringify(inputState)) { + let prevState = inputState; + inputState = nextInputState; + return keyQueueChanged(sender, prevState, inputState); + } return backgroundReducers(undefined, action, sender); -}); +}; + +browser.runtime.onMessage.addListener(handleMessage); diff --git a/src/background/key-queue.js b/src/background/keys.js similarity index 57% rename from src/background/key-queue.js rename to src/background/keys.js index 924bf77..0ce53fa 100644 --- a/src/background/key-queue.js +++ b/src/background/keys.js @@ -1,6 +1,6 @@ import actions from '../actions'; -const DEFAULT_KEYMAP = { +const defaultKeymap = { ':': { type: actions.CMD_OPEN }, 'o': { type: actions.CMD_TABS_OPEN, alter: false }, 'O': { type: actions.CMD_TABS_OPEN, alter: true }, @@ -32,51 +32,26 @@ const DEFAULT_KEYMAP = { 'L': { type: actions.HISTORY_NEXT }, } -export default class KeyQueue { - - constructor(keymap = DEFAULT_KEYMAP) { - this.data = []; - this.keymap = keymap; - } - - push(key) { - this.data.push(key); - - let current = this.asKeymapChars(); - let filtered = Object.keys(this.keymap).filter((keys) => { - return keys.startsWith(current); - }); - - if (filtered.length == 0) { - this.data = []; - return null; - } else if (filtered.length === 1 && current === filtered[0]) { - let action = this.keymap[filtered[0]]; - this.data = []; - return action; +const asKeymapChars = (keys) => { + return keys.map((k) => { + let c = String.fromCharCode(k.code); + if (k.ctrl) { + return ''; + } else { + return c } - return null; - } - - asKeymapChars() { - return this.data.map((k) => { - let c = String.fromCharCode(k.code); - if (k.ctrl) { - return ''; - } else { - return c - } - }).join(''); - } + }).join(''); +} - asCaretChars() { - return this.data.map((k) => { - let c = String.fromCharCode(k.code); - if (k.ctrl) { - return '^' + c.toUpperCase(); - } else { - return c; - } - }).join(''); - } +const asCaretChars = (keys) => { + return keys.map((k) => { + let c = String.fromCharCode(k.code); + if (k.ctrl) { + return '^' + c.toUpperCase(); + } else { + return c; + } + }).join(''); } + +export { defaultKeymap, asKeymapChars, asCaretChars }; diff --git a/src/background/tabs.js b/src/background/tabs.js index 111bbd9..bd69b4b 100644 --- a/src/background/tabs.js +++ b/src/background/tabs.js @@ -59,7 +59,7 @@ const getCompletions = (keyword) => { }; const selectPrevTab = (current, count) => { - return browser.tabs.query({ currentWindow: true }, (tabs) => { + return browser.tabs.query({ currentWindow: true }).then((tabs) => { if (tabs.length < 2) { return; } @@ -70,7 +70,7 @@ const selectPrevTab = (current, count) => { }; const selectNextTab = (current, count) => { - return browser.tabs.query({ currentWindow: true }, (tabs) => { + return browser.tabs.query({ currentWindow: true }).then((tabs) => { if (tabs.length < 2) { return; } diff --git a/src/content/index.js b/src/content/index.js index 314dfea..12d079f 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -1,4 +1,5 @@ import '../console/console-frame.scss'; +import * as inputActions from '../actions/input'; import * as consoleFrames from '../console/frames'; import actions from '../actions'; import contentReducer from '../reducers/content'; @@ -14,14 +15,7 @@ window.addEventListener("keypress", (e) => { if (e.target instanceof HTMLInputElement) { return; } - - let request = { - type: 'event.keypress', - code: e.which, - ctrl: e.ctrlKey, - } - - browser.runtime.sendMessage(request) + browser.runtime.sendMessage(inputActions.keyPress(e.which, e.ctrlKey)) .catch((err) => { console.error("Vim Vixen:", err); return consoleFrames.showError(err.message); diff --git a/src/reducers/input.js b/src/reducers/input.js new file mode 100644 index 0000000..25ff1a3 --- /dev/null +++ b/src/reducers/input.js @@ -0,0 +1,23 @@ +import actions from '../actions'; + +const defaultState = { + keys: [], +}; + +export default function reducer(state = defaultState, action = {}) { + switch (action.type) { + case actions.INPUT_KEY_PRESS: + return Object.assign({}, state, { + keys: state.keys.concat([{ + code: action.code, + ctrl: action.ctrl + }]) + }); + case actions.INPUT_CLEAR_KEYS: + return Object.assign({}, state, { + keys: [], + }); + default: + return state; + } +} diff --git a/test/background/key-queue.test.js b/test/background/key-queue.test.js deleted file mode 100644 index ac43228..0000000 --- a/test/background/key-queue.test.js +++ /dev/null @@ -1,50 +0,0 @@ -import { expect } from "chai"; -import KeyQueue from '../../src/background/key-queue'; - -describe("keyQueue class", () => { - const KEYMAP = { - 'gGG': [], - 'gg': [ 'scroll.top' ], - }; - - const g = 'g'.charCodeAt(0); - const G = 'G'.charCodeAt(0); - const x = 'x'.charCodeAt(0); - - describe("#push", () => { - it("returns matched action", () => { - let queue = new KeyQueue(KEYMAP); - queue.push({ code: g }); - let action = queue.push({ code: g }); - - expect(action).to.deep.equal([ 'scroll.top' ]); - }); - - it("returns null on no actions matched", () => { - let queue = new KeyQueue(KEYMAP); - queue.push({ code: g }); - let action = queue.push({ code: G }); - - expect(action).to.be.null; - expect(queue.asKeymapChars()).to.be.empty; - }); - }); - - describe('#asKeymapChars', () => { - let queue = new KeyQueue(KEYMAP); - queue.push({ code: g }); - queue.push({ code: x, ctrl: true }); - queue.push({ code: G }); - - expect(queue.asKeymapChars()).to.equal('gG'); - }); - - describe('#asCaretChars', () => { - let queue = new KeyQueue(KEYMAP); - queue.push({ code: g }); - queue.push({ code: x, ctrl: true }); - queue.push({ code: G }); - - expect(queue.asCaretChars()).to.equal('g^XG'); - }); -}); diff --git a/test/background/keys.test.js b/test/background/keys.test.js new file mode 100644 index 0000000..2cb9a3a --- /dev/null +++ b/test/background/keys.test.js @@ -0,0 +1,31 @@ +import { expect } from "chai"; +import * as keys from '../../src/background/keys'; + +describe("keys", () => { + const KEYMAP = { + 'gGG': [], + 'gg': { type: 'scroll.top' }, + }; + + const g = 'g'.charCodeAt(0); + const G = 'G'.charCodeAt(0); + const x = 'x'.charCodeAt(0); + + describe('#asKeymapChars', () => { + let keySequence = [ + { code: g }, + { code: x, ctrl: true }, + { code: G } + ]; + expect(keys.asKeymapChars(keySequence)).to.equal('gG'); + }); + + describe('#asCaretChars', () => { + let keySequence = [ + { code: g }, + { code: x, ctrl: true }, + { code: G } + ]; + expect(keys.asCaretChars(keySequence)).to.equal('g^XG'); + }); +}); From 14d13e2c3abdb090431f59970681cdaf95f0a24a Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 22:23:17 +0900 Subject: [PATCH 15/18] add tests for input action/reducer --- test/actions/input.test.js | 17 +++++++++++++++++ test/reducers/input.test.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 test/actions/input.test.js create mode 100644 test/reducers/input.test.js diff --git a/test/actions/input.test.js b/test/actions/input.test.js new file mode 100644 index 0000000..a49a5bc --- /dev/null +++ b/test/actions/input.test.js @@ -0,0 +1,17 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as inputActions from '../../src/actions/input'; + +describe("input actions", () => { + describe("keyPress", () => { + let action = inputActions.keyPress(123, true); + expect(action.type).to.equal(actions.INPUT_KEY_PRESS); + expect(action.code).to.equal(123); + expect(action.ctrl).to.be.true; + }); + + describe("clearKeys", () => { + let action = inputActions.clearKeys(); + expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + }); +}); diff --git a/test/reducers/input.test.js b/test/reducers/input.test.js new file mode 100644 index 0000000..d7a0855 --- /dev/null +++ b/test/reducers/input.test.js @@ -0,0 +1,34 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import inputReducer from '../../src/reducers/input'; + +describe("input reducer", () => { + it('return the initial state', () => { + let state = inputReducer(undefined, {}); + expect(state).to.have.deep.property('keys', []); + }); + + it('return next state for INPUT_KEY_PRESS', () => { + let action = { type: actions.INPUT_KEY_PRESS, code: 123, ctrl: true }; + let state = inputReducer(undefined, action); + expect(state).to.have.deep.property('keys', [{ code: 123, ctrl: true }]); + + action = { type: actions.INPUT_KEY_PRESS, code: 456, ctrl: false }; + state = inputReducer(state, action); + expect(state).to.have.deep.property('keys', [ + { code: 123, ctrl: true }, + { code: 456, ctrl: false } + ]); + }); + + it('return next state for INPUT_CLEAR_KEYS', () => { + let action = { type: actions.INPUT_CLEAR_KEYS }; + let state = inputReducer({ + keys: [ + { code: 123, ctrl: true }, + { code: 456, ctrl: false } + ] + }, action); + expect(state).to.have.deep.property('keys', []); + }); +}); From bf890a6d9d793b581a44ee267616ed589f429bef Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 11 Sep 2017 21:07:02 +0900 Subject: [PATCH 16/18] command as action/reducer --- src/actions/command.js | 35 ++++++++++++++++++++++++++++++ src/actions/index.js | 4 ++++ src/background/index.js | 48 ++++++----------------------------------- src/console/console.js | 10 ++------- src/reducers/command.js | 24 +++++++++++++++++++++ 5 files changed, 71 insertions(+), 50 deletions(-) create mode 100644 src/actions/command.js create mode 100644 src/reducers/command.js diff --git a/src/actions/command.js b/src/actions/command.js new file mode 100644 index 0000000..982255c --- /dev/null +++ b/src/actions/command.js @@ -0,0 +1,35 @@ +import actions from '../actions'; + +const normalizeUrl = (string) => { + try { + return new URL(string).href + } catch (e) { + return 'http://' + string; + } +} + +export function exec(line) { + let name = line.split(' ')[0]; + let remaining = line.replace(name + ' ', ''); + + switch (name) { + case 'open': + // TODO use search engined and pass keywords to them + return { + type: actions.COMMAND_OPEN_URL, + url: normalizeUrl(remaining) + }; + case 'tabopen': + return { + type: actions.COMMAND_TABOPEN_URL, + url: remaining + }; + case 'b': + case 'buffer': + return { + type: actions.COMMAND_BUFFER, + keywords: remaining + }; + } + throw new Error(name + ' command is not defined'); +} diff --git a/src/actions/index.js b/src/actions/index.js index 135dd4a..63d5f6f 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -33,4 +33,8 @@ export default { // User input INPUT_KEY_PRESS: 'input.key,press', INPUT_CLEAR_KEYS: 'input.clear.keys', + + COMMAND_OPEN_URL: 'command.open.url', + COMMAND_TABOPEN_URL: 'command.tabopen.url', + COMMAND_BUFFER: 'command.buffer', }; diff --git a/src/background/index.js b/src/background/index.js index 4d75b33..e72cab0 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -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); diff --git a/src/console/console.js b/src/console/console.js index f83f79c..25ab36d 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,6 +1,7 @@ import './console.scss'; import * as backgroundActions from '../actions/background'; import * as consoleActions from '../actions/console'; +import * as commandActions from '../actions/command'; import Completion from './completion'; import consoleReducer from '../reducers/console'; @@ -10,13 +11,6 @@ var completion = null; var completionOrigin = ""; let state = consoleReducer(undefined, {}); -const keydownMessage = (input) => { - return { - type: 'vimvixen.command.enter', - value: input.value - }; -}; - const handleBlur = () => { return browser.runtime.sendMessage(consoleActions.hide()); }; @@ -58,7 +52,7 @@ const handleKeydown = (e) => { case KeyboardEvent.DOM_VK_ESCAPE: return input.blur(); case KeyboardEvent.DOM_VK_RETURN: - return browser.runtime.sendMessage(keydownMessage(e.target)); + return browser.runtime.sendMessage(commandActions.exec(e.target.value)); case KeyboardEvent.DOM_VK_TAB: if (e.shiftKey) { completePrev(); diff --git a/src/reducers/command.js b/src/reducers/command.js new file mode 100644 index 0000000..7e03593 --- /dev/null +++ b/src/reducers/command.js @@ -0,0 +1,24 @@ +import * as tabs from '../background/tabs'; +import actions from '../actions'; + +const cmdBuffer = (sender, arg) => { + if (isNaN(arg)) { + return tabs.selectByKeyword(sender.tab, arg); + } else { + let index = parseInt(arg, 10) - 1; + return tabs.selectAt(index); + } +} + +export default function reducer(state, action, sender) { + switch (action.type) { + case actions.COMMAND_OPEN_URL: + return browser.tabs.update(sender.tab.id, { url: action.url }); + case actions.COMMAND_TABOPEN_URL: + return browser.tabs.create({ url: action.url }); + case actions.COMMAND_BUFFER: + return cmdBuffer(sender, action.keywords); + default: + return Promise.resolve(); + } +} From 2190a525b40a102851121c40654dcde2bb5ac6b3 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 11 Sep 2017 21:37:32 +0900 Subject: [PATCH 17/18] add command actions test --- src/actions/command.js | 2 +- test/actions/command.test.js | 51 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 test/actions/command.test.js diff --git a/src/actions/command.js b/src/actions/command.js index 982255c..c983278 100644 --- a/src/actions/command.js +++ b/src/actions/command.js @@ -22,7 +22,7 @@ export function exec(line) { case 'tabopen': return { type: actions.COMMAND_TABOPEN_URL, - url: remaining + url: normalizeUrl(remaining) }; case 'b': case 'buffer': diff --git a/test/actions/command.test.js b/test/actions/command.test.js new file mode 100644 index 0000000..01a67f2 --- /dev/null +++ b/test/actions/command.test.js @@ -0,0 +1,51 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as commandActions from '../../src/actions/command'; + +describe("command actions", () => { + describe("exec", () => { + context("open command", () => { + it('create COMMAND_OPEN_URL acion with a full url', () => { + let action = commandActions.exec("open https://github.com/") + expect(action.type).to.equal(actions.COMMAND_OPEN_URL); + expect(action.url).to.equal('https://github.com/'); + }); + + it('create COMMAND_OPEN_URL acion with a domain name', () => { + let action = commandActions.exec("open github.com") + expect(action.type).to.equal(actions.COMMAND_OPEN_URL); + expect(action.url).to.equal('http://github.com'); + }); + }); + + context("tabopen command", () => { + it('create COMMAND_TABOPEN_URL acion with a full url', () => { + let action = commandActions.exec("tabopen https://github.com/") + expect(action.type).to.equal(actions.COMMAND_TABOPEN_URL); + expect(action.url).to.equal('https://github.com/'); + }); + + it('create COMMAND_TABOPEN_URL acion with a domain name', () => { + let action = commandActions.exec("tabopen github.com") + expect(action.type).to.equal(actions.COMMAND_TABOPEN_URL); + expect(action.url).to.equal('http://github.com'); + }); + }); + + context("buffer command", () => { + it('create COMMAND_BUFFER acion with a keywords', () => { + let action = commandActions.exec("buffer foo bar") + expect(action.type).to.equal(actions.COMMAND_BUFFER); + expect(action.keywords).to.equal('foo bar'); + }); + }); + + context("b command", () => { + it('create COMMAND_BUFFER acion with a keywords', () => { + let action = commandActions.exec("b foo bar") + expect(action.type).to.equal(actions.COMMAND_BUFFER); + expect(action.keywords).to.equal('foo bar'); + }); + }); + }); +}); From 7bc569eac745b97137e1db8b9271493b3e5c8a20 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 11 Sep 2017 21:37:51 +0900 Subject: [PATCH 18/18] fix input actions test --- test/actions/input.test.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/actions/input.test.js b/test/actions/input.test.js index a49a5bc..9ec6de4 100644 --- a/test/actions/input.test.js +++ b/test/actions/input.test.js @@ -4,14 +4,18 @@ import * as inputActions from '../../src/actions/input'; describe("input actions", () => { describe("keyPress", () => { - let action = inputActions.keyPress(123, true); - expect(action.type).to.equal(actions.INPUT_KEY_PRESS); - expect(action.code).to.equal(123); - expect(action.ctrl).to.be.true; + it('create INPUT_KEY_PRESS action', () => { + let action = inputActions.keyPress(123, true); + expect(action.type).to.equal(actions.INPUT_KEY_PRESS); + expect(action.code).to.equal(123); + expect(action.ctrl).to.be.true; + }); }); describe("clearKeys", () => { - let action = inputActions.clearKeys(); - expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + it('create INPUT_CLEAR_KEYSaction', () => { + let action = inputActions.clearKeys(); + expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + }); }); });