Merge branch 'buffer'

2 files changed, 17 insertions, 7 deletions

diff --git a/src/console/console-frame.js b/src/console/console-frame.js
index aabb96a..ea9f523 100644
--- a/src/console/console-frame.js
+++ b/src/console/console-frame.js
@@ -10,6 +10,8 @@ export default class ConsoleFrame {
 
     this.element = element;
 
+    this.errorShown = true;
+
     this.hide();
   }
 
@@ -21,6 +23,7 @@ export default class ConsoleFrame {
       text: text
     };
     messages.send(this.element.contentWindow, message);
+    this.errorShown = false;
   }
 
   showError(text) {
@@ -31,6 +34,8 @@ export default class ConsoleFrame {
       text: text
     };
     messages.send(this.element.contentWindow, message);
+    this.errorShown = true;
+    this.element.blur();
   }
 
   showFrame() {
@@ -40,5 +45,10 @@ export default class ConsoleFrame {
   hide() {
     this.element.style.display = 'none';
     this.element.blur();
+    this.errorShown = false;
+  }
+
+  isErrorShown() {
+    return this.element.style.display === 'block' && this.errorShown;
   }
 }
diff --git a/src/console/console.js b/src/console/console.js
index a171ecc..e0227aa 100644
--- a/src/console/console.js
+++ b/src/console/console.js
@@ -8,20 +8,20 @@ var prevValue = "";
 
 const blurMessage = () => {
   return {
-    type: 'vimvixen.commandline.blur'
+    type: 'vimvixen.command.blur'
   };
 };
 
 const keydownMessage = (input) => {
   return {
-    type: 'vimvixen.commandline.enter',
+    type: 'vimvixen.command.enter',
     value: input.value
   };
 };
 
 const keyupMessage = (input) => {
   return {
-    type: 'vimvixen.commandline.change',
+    type: 'vimvixen.command.change',
     value: input.value
   };
 };
@@ -57,15 +57,15 @@ window.addEventListener('load', () => {
 });
 
 const showCommand = (text) => {
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-  input.value = text;
-  input.focus();
-
   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();
 }
 
 const showError = (text) => {