Show info on yanked
This commit is contained in:
parent
b0d2b53281
commit
7ac00fce6f
12 changed files with 84 additions and 31 deletions
|
@ -14,6 +14,13 @@ const showError = (text) => {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const showInfo = (text) => {
|
||||||
|
return {
|
||||||
|
type: actions.CONSOLE_SHOW_INFO,
|
||||||
|
text: text
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
const hideCommand = () => {
|
const hideCommand = () => {
|
||||||
return {
|
return {
|
||||||
type: actions.CONSOLE_HIDE_COMMAND,
|
type: actions.CONSOLE_HIDE_COMMAND,
|
||||||
|
@ -40,6 +47,6 @@ const completionPrev = () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
showCommand, showError, hideCommand,
|
showCommand, showError, showInfo, hideCommand,
|
||||||
setCompletions, completionNext, completionPrev
|
setCompletions, completionNext, completionPrev
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
export default {
|
export default {
|
||||||
// console commands
|
// console commands
|
||||||
CONSOLE_SHOW_COMMAND: 'console.show.command',
|
CONSOLE_SHOW_COMMAND: 'console.show.command',
|
||||||
CONSOLE_SET_COMPLETIONS: 'console.set.completions',
|
|
||||||
CONSOLE_SHOW_ERROR: 'console.show.error',
|
CONSOLE_SHOW_ERROR: 'console.show.error',
|
||||||
|
CONSOLE_SHOW_INFO: 'console.show.info',
|
||||||
CONSOLE_HIDE_COMMAND: 'console.hide.command',
|
CONSOLE_HIDE_COMMAND: 'console.hide.command',
|
||||||
|
CONSOLE_SET_COMPLETIONS: 'console.set.completions',
|
||||||
CONSOLE_COMPLETION_NEXT: 'console.completion.next',
|
CONSOLE_COMPLETION_NEXT: 'console.completion.next',
|
||||||
CONSOLE_COMPLETION_PREV: 'console.completion.prev',
|
CONSOLE_COMPLETION_PREV: 'console.completion.prev',
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,7 +16,7 @@ export default class ConsoleComponent {
|
||||||
input.addEventListener('keyup', this.onKeyUp.bind(this));
|
input.addEventListener('keyup', this.onKeyUp.bind(this));
|
||||||
|
|
||||||
this.hideCommand();
|
this.hideCommand();
|
||||||
this.hideError();
|
this.hideMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
onBlur() {
|
onBlur() {
|
||||||
|
@ -78,11 +78,10 @@ export default class ConsoleComponent {
|
||||||
this.hideCommand();
|
this.hideCommand();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state.mode === 'error') {
|
if (state.mode === 'error' || state.mode === 'info') {
|
||||||
this.setErrorText(state.messageText);
|
this.showMessage(state.mode, state.messageText);
|
||||||
this.showError();
|
|
||||||
} else {
|
} else {
|
||||||
this.hideError();
|
this.hideMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state.groupSelection >= 0 && state.itemSelection >= 0) {
|
if (state.groupSelection >= 0 && state.itemSelection >= 0) {
|
||||||
|
@ -128,21 +127,21 @@ export default class ConsoleComponent {
|
||||||
input.value = this.completionOrigin;
|
input.value = this.completionOrigin;
|
||||||
}
|
}
|
||||||
|
|
||||||
setErrorText(text) {
|
showMessage(mode, text) {
|
||||||
let doc = this.wrapper.ownerDocument;
|
let doc = this.wrapper.ownerDocument;
|
||||||
let error = doc.querySelector('#vimvixen-console-error');
|
let error = doc.querySelector('#vimvixen-console-message');
|
||||||
|
error.classList.remove(
|
||||||
|
'vimvixen-console-info',
|
||||||
|
'vimvixen-console-error'
|
||||||
|
);
|
||||||
|
error.classList.add('vimvixen-console-' + mode);
|
||||||
error.textContent = text;
|
error.textContent = text;
|
||||||
}
|
|
||||||
|
|
||||||
showError() {
|
|
||||||
let doc = this.wrapper.ownerDocument;
|
|
||||||
let error = doc.querySelector('#vimvixen-console-error');
|
|
||||||
error.style.display = 'block';
|
error.style.display = 'block';
|
||||||
}
|
}
|
||||||
|
|
||||||
hideError() {
|
hideMessage() {
|
||||||
let doc = this.wrapper.ownerDocument;
|
let doc = this.wrapper.ownerDocument;
|
||||||
let error = doc.querySelector('#vimvixen-console-error');
|
let error = doc.querySelector('#vimvixen-console-message');
|
||||||
error.style.display = 'none';
|
error.style.display = 'none';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<script src='console.js'></script>
|
<script src='console.js'></script>
|
||||||
</head>
|
</head>
|
||||||
<body class='vimvixen-console'>
|
<body class='vimvixen-console'>
|
||||||
<p id='vimvixen-console-error'
|
<p id='vimvixen-console-message'
|
||||||
class='vimvixen-console-error'></p>
|
class='vimvixen-console-message'></p>
|
||||||
<div id='vimvixen-console-command'>
|
<div id='vimvixen-console-command'>
|
||||||
<ul id='vimvixen-console-completion' class='vimvixen-console-completion'></ul>
|
<ul id='vimvixen-console-completion' class='vimvixen-console-completion'></ul>
|
||||||
<div class='vimvixen-console-command'>
|
<div class='vimvixen-console-command'>
|
||||||
|
|
|
@ -17,18 +17,25 @@ window.addEventListener('load', () => {
|
||||||
consoleComponent = new ConsoleComponent(document.body, store);
|
consoleComponent = new ConsoleComponent(document.body, store);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const onMessage = (message) => {
|
||||||
|
switch (message.type) {
|
||||||
|
case messages.CONSOLE_SHOW_COMMAND:
|
||||||
|
return store.dispatch(consoleActions.showCommand(message.command));
|
||||||
|
case messages.CONSOLE_SHOW_ERROR:
|
||||||
|
return store.dispatch(consoleActions.showError(message.text));
|
||||||
|
case messages.CONSOLE_SHOW_INFO:
|
||||||
|
return store.dispatch(consoleActions.showInfo(message.text));
|
||||||
|
case messages.CONSOLE_HIDE_COMMAND:
|
||||||
|
return store.dispatch(consoleActions.hideCommand());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
store.subscribe(() => {
|
store.subscribe(() => {
|
||||||
completionComponent.update();
|
completionComponent.update();
|
||||||
consoleComponent.update();
|
consoleComponent.update();
|
||||||
});
|
});
|
||||||
|
|
||||||
browser.runtime.onMessage.addListener((action) => {
|
browser.runtime.onMessage.addListener(onMessage);
|
||||||
switch (action.type) {
|
window.addEventListener('message', (message) => {
|
||||||
case messages.CONSOLE_SHOW_COMMAND:
|
onMessage(JSON.parse(message.data));
|
||||||
return store.dispatch(consoleActions.showCommand(action.command));
|
}, false);
|
||||||
case messages.CONSOLE_SHOW_ERROR:
|
|
||||||
return store.dispatch(consoleActions.showError(action.text));
|
|
||||||
case messages.CONSOLE_HIDE_COMMAND:
|
|
||||||
return store.dispatch(consoleActions.hideCommand());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
|
@ -57,6 +57,11 @@ export default function reducer(state = defaultState, action = {}) {
|
||||||
mode: 'error',
|
mode: 'error',
|
||||||
messageText: action.text,
|
messageText: action.text,
|
||||||
});
|
});
|
||||||
|
case actions.CONSOLE_SHOW_INFO:
|
||||||
|
return Object.assign({}, state, {
|
||||||
|
mode: 'info',
|
||||||
|
messageText: action.text,
|
||||||
|
});
|
||||||
case actions.CONSOLE_HIDE_COMMAND:
|
case actions.CONSOLE_HIDE_COMMAND:
|
||||||
return Object.assign({}, state, {
|
return Object.assign({}, state, {
|
||||||
mode: state.mode === 'command' ? '' : state.mode,
|
mode: state.mode === 'command' ? '' : state.mode,
|
||||||
|
|
|
@ -64,12 +64,20 @@ body {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&-message {
|
||||||
|
@include consoole-font;
|
||||||
|
}
|
||||||
|
|
||||||
&-error {
|
&-error {
|
||||||
background-color: red;
|
background-color: red;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: white;
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
@include consoole-font;
|
&-info {
|
||||||
|
background-color: white;
|
||||||
|
font-weight: normal;
|
||||||
|
color: green;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-command {
|
&-command {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import * as scrolls from 'content/scrolls';
|
||||||
import * as navigates from 'content/navigates';
|
import * as navigates from 'content/navigates';
|
||||||
import * as urls from 'content/urls';
|
import * as urls from 'content/urls';
|
||||||
import * as followActions from 'content/actions/follow';
|
import * as followActions from 'content/actions/follow';
|
||||||
|
import * as consoleFrames from 'content/console-frames';
|
||||||
|
|
||||||
const exec = (operation) => {
|
const exec = (operation) => {
|
||||||
switch (operation.type) {
|
switch (operation.type) {
|
||||||
|
@ -34,7 +35,11 @@ const exec = (operation) => {
|
||||||
case operations.NAVIGATE_ROOT:
|
case operations.NAVIGATE_ROOT:
|
||||||
return navigates.root(window);
|
return navigates.root(window);
|
||||||
case operations.URLS_YANK:
|
case operations.URLS_YANK:
|
||||||
return urls.yank(window);
|
urls.yank(window);
|
||||||
|
return consoleFrames.postMessage(window.document, {
|
||||||
|
type: messages.CONSOLE_SHOW_INFO,
|
||||||
|
text: 'Current url yanked',
|
||||||
|
});
|
||||||
default:
|
default:
|
||||||
browser.runtime.sendMessage({
|
browser.runtime.sendMessage({
|
||||||
type: messages.BACKGROUND_OPERATION,
|
type: messages.BACKGROUND_OPERATION,
|
||||||
|
|
|
@ -15,4 +15,9 @@ const blur = (doc) => {
|
||||||
iframe.blur();
|
iframe.blur();
|
||||||
};
|
};
|
||||||
|
|
||||||
export { initialize, blur };
|
const postMessage = (doc, message) => {
|
||||||
|
let iframe = doc.getElementById('vimvixen-console-frame');
|
||||||
|
iframe.contentWindow.postMessage(JSON.stringify(message), '*');
|
||||||
|
};
|
||||||
|
|
||||||
|
export { initialize, blur, postMessage };
|
||||||
|
|
|
@ -8,6 +8,7 @@ export default {
|
||||||
CONSOLE_QUERY_COMPLETIONS: 'console.query.completions',
|
CONSOLE_QUERY_COMPLETIONS: 'console.query.completions',
|
||||||
CONSOLE_SHOW_COMMAND: 'console.show.command',
|
CONSOLE_SHOW_COMMAND: 'console.show.command',
|
||||||
CONSOLE_SHOW_ERROR: 'console.show.error',
|
CONSOLE_SHOW_ERROR: 'console.show.error',
|
||||||
|
CONSOLE_SHOW_INFO: 'console.show.info',
|
||||||
CONSOLE_HIDE_COMMAND: 'console.hide.command',
|
CONSOLE_HIDE_COMMAND: 'console.hide.command',
|
||||||
|
|
||||||
OPEN_URL: 'open.url',
|
OPEN_URL: 'open.url',
|
||||||
|
|
|
@ -11,6 +11,14 @@ describe("console actions", () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("showInfo", () => {
|
||||||
|
it('create CONSOLE_SHOW_INFO action', () => {
|
||||||
|
let action = consoleActions.showInfo('an info');
|
||||||
|
expect(action.type).to.equal(actions.CONSOLE_SHOW_INFO);
|
||||||
|
expect(action.text).to.equal('an info');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("showError", () => {
|
describe("showError", () => {
|
||||||
it('create CONSOLE_SHOW_ERROR action', () => {
|
it('create CONSOLE_SHOW_ERROR action', () => {
|
||||||
let action = consoleActions.showError('an error');
|
let action = consoleActions.showError('an error');
|
||||||
|
|
|
@ -20,6 +20,13 @@ describe("console reducer", () => {
|
||||||
expect(state).to.have.property('commandText', 'open ');
|
expect(state).to.have.property('commandText', 'open ');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('return next state for CONSOLE_SHOW_INFO', () => {
|
||||||
|
let action = { type: actions.CONSOLE_SHOW_INFO, text: 'an info' };
|
||||||
|
let state = reducer({}, action);
|
||||||
|
expect(state).to.have.property('mode', 'info');
|
||||||
|
expect(state).to.have.property('messageText', 'an info');
|
||||||
|
});
|
||||||
|
|
||||||
it('return next state for CONSOLE_SHOW_ERROR', () => {
|
it('return next state for CONSOLE_SHOW_ERROR', () => {
|
||||||
let action = { type: actions.CONSOLE_SHOW_ERROR, text: 'an error' };
|
let action = { type: actions.CONSOLE_SHOW_ERROR, text: 'an error' };
|
||||||
let state = reducer({}, action);
|
let state = reducer({}, action);
|
||||||
|
|
Reference in a new issue