Merge pull request #24 from ueokande/yank-url

Yank url

1 files changed, 12 insertions, 14 deletions

diff --git a/src/console/reducers/index.js b/src/console/reducers/index.js
index ee9c691..d4affa7 100644
--- a/src/console/reducers/index.js
+++ b/src/console/reducers/index.js
@@ -1,9 +1,8 @@
 import actions from 'console/actions';
 
 const defaultState = {
-  errorShown: false,
-  errorText: '',
-  commandShown: false,
+  mode: '',
+  messageText: '',
   commandText: '',
   completions: [],
   groupSelection: -1,
@@ -48,25 +47,24 @@ export default function reducer(state = defaultState, action = {}) {
   switch (action.type) {
   case actions.CONSOLE_SHOW_COMMAND:
     return Object.assign({}, state, {
-      commandShown: true,
+      mode: 'command',
       commandText: action.text,
       errorShown: false,
       completions: []
     });
   case actions.CONSOLE_SHOW_ERROR:
     return Object.assign({}, state, {
-      errorText: action.text,
-      errorShown: true,
-      commandShown: false,
+      mode: 'error',
+      messageText: action.text,
     });
-  case actions.CONSOLE_HIDE:
-    if (state.errorShown) {
-      // keep error message if shown
-      return state;
-    }
+  case actions.CONSOLE_SHOW_INFO:
     return Object.assign({}, state, {
-      errorShown: false,
-      commandShown: false
+      mode: 'info',
+      messageText: action.text,
+    });
+  case actions.CONSOLE_HIDE_COMMAND:
+    return Object.assign({}, state, {
+      mode: state.mode === 'command' ? '' : state.mode,
     });
   case actions.CONSOLE_SET_COMPLETIONS:
     return Object.assign({}, state, {