aboutsummaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
Diffstat (limited to 'src/console')
-rw-r--r--src/console/console-frame.js61
-rw-r--r--src/console/console.js150
-rw-r--r--src/console/frames.js27
3 files changed, 88 insertions, 150 deletions
diff --git a/src/console/console-frame.js b/src/console/console-frame.js
deleted file mode 100644
index e6bf3f5..0000000
--- a/src/console/console-frame.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import './console-frame.scss';
-import * as messages from '../shared/messages';
-
-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();
-
- let message = {
- type: 'vimvixen.console.show.command',
- text: text
- };
- messages.send(this.element.contentWindow, message);
- this.errorShown = false;
- }
-
- showError(text) {
- this.showFrame();
-
- let message = {
- type: 'vimvixen.console.show.error',
- text: text
- };
- messages.send(this.element.contentWindow, message);
- this.errorShown = true;
- this.element.blur();
- }
-
- showFrame() {
- this.element.style.display = 'block';
- }
-
- hide() {
- this.element.style.display = 'none';
- this.element.blur();
- this.errorShown = false;
- }
-
- isErrorShown() {
- return this.element.style.display === 'block' && this.errorShown;
- }
-
- setCompletions(completions) {
- messages.send(this.element.contentWindow, {
- type: 'vimvixen.console.set.completions',
- completions: completions
- });
- }
-}
diff --git a/src/console/console.js b/src/console/console.js
index c32eca0..25ab36d 100644
--- a/src/console/console.js
+++ b/src/console/console.js
@@ -1,36 +1,18 @@
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 * as messages from '../shared/messages';
-
-const parent = window.parent;
+import consoleReducer from '../reducers/console';
// TODO consider object-oriented
var prevValue = "";
var completion = null;
var completionOrigin = "";
-
-const blurMessage = () => {
- return {
- type: 'vimvixen.command.blur'
- };
-};
-
-const keydownMessage = (input) => {
- return {
- type: 'vimvixen.command.enter',
- value: input.value
- };
-};
-
-const keyupMessage = (input) => {
- return {
- type: 'vimvixen.command.change',
- value: input.value
- };
-};
+let state = consoleReducer(undefined, {});
const handleBlur = () => {
- messages.send(parent, blurMessage());
+ return browser.runtime.sendMessage(consoleActions.hide());
};
const completeNext = () => {
@@ -64,13 +46,13 @@ const completePrev = () => {
}
const handleKeydown = (e) => {
+ let input = window.document.querySelector('#vimvixen-console-command-input');
+
switch(e.keyCode) {
case KeyboardEvent.DOM_VK_ESCAPE:
- messages.send(parent, blurMessage());
- break;
+ return input.blur();
case KeyboardEvent.DOM_VK_RETURN:
- messages.send(parent, keydownMessage(e.target));
- break;
+ return browser.runtime.sendMessage(commandActions.exec(e.target.value));
case KeyboardEvent.DOM_VK_TAB:
if (e.shiftKey) {
completePrev();
@@ -90,8 +72,10 @@ const handleKeyup = (e) => {
if (e.target.value === prevValue) {
return;
}
- messages.send(parent, keyupMessage(e.target));
prevValue = e.target.value;
+ return browser.runtime.sendMessage(
+ backgroundActions.requestCompletions(e.target.value)
+ );
};
window.addEventListener('load', () => {
@@ -101,35 +85,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 = '';
- messages.send(parent, 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';
-}
-
const createCompletionTitle = (text) => {
let li = document.createElement('li');
li.className = 'vimvixen-console-completion-title';
@@ -154,55 +109,72 @@ 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);
-
- let input = window.document.querySelector('#vimvixen-console-command-input');
completionOrigin = input.value.split(' ')[0];
}
-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');
- }
- });
-};
+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');
-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;
- case 'vimvixen.console.set.completions':
- setCompletions(message.completions);
- break;
+ error.style.display = state.errorShown ? 'block' : 'none';
+ error.textContent = state.errorText;
+
+ 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) => {
+ let nextState = consoleReducer(state, action);
+ if (JSON.stringify(nextState) !== JSON.stringify(state)) {
+ update(state, nextState);
+ 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 };
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 12:19:20 +0000