Merge pull request #24 from ueokande/yank-url

Yank url

1 files changed, 15 insertions, 16 deletions

diff --git a/src/console/components/console.js b/src/console/components/console.js
index 9023d91..93802f8 100644
--- a/src/console/components/console.js
+++ b/src/console/components/console.js
@@ -16,7 +16,7 @@ export default class ConsoleComponent {
     input.addEventListener('keyup', this.onKeyUp.bind(this));
 
     this.hideCommand();
-    this.hideError();
+    this.hideMessage();
   }
 
   onBlur() {
@@ -72,17 +72,16 @@ export default class ConsoleComponent {
 
   update() {
     let state = this.store.getState();
-    if (!this.prevState.commandShown && state.commandShown) {
+    if (this.prevState.mode !== 'command' && state.mode === 'command') {
       this.showCommand(state.commandText);
-    } else if (!state.commandShown) {
+    } else if (state.mode !== 'command') {
       this.hideCommand();
     }
 
-    if (state.errorShown) {
-      this.setErrorText(state.errorText);
-      this.showError();
+    if (state.mode === 'error' || state.mode === 'info') {
+      this.showMessage(state.mode, state.messageText);
     } else {
-      this.hideError();
+      this.hideMessage();
     }
 
     if (state.groupSelection >= 0 && state.itemSelection >= 0) {
@@ -128,21 +127,21 @@ export default class ConsoleComponent {
     input.value = this.completionOrigin;
   }
 
-  setErrorText(text) {
+  showMessage(mode, text) {
     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;
-  }
-
-  showError() {
-    let doc = this.wrapper.ownerDocument;
-    let error = doc.querySelector('#vimvixen-console-error');
     error.style.display = 'block';
   }
 
-  hideError() {
+  hideMessage() {
     let doc = this.wrapper.ownerDocument;
-    let error = doc.querySelector('#vimvixen-console-error');
+    let error = doc.querySelector('#vimvixen-console-message');
     error.style.display = 'none';
   }
 }