diff options
Diffstat (limited to 'web/src')
| -rw-r--r-- | web/src/js/components/FlowView.jsx | 4 | ||||
| -rw-r--r-- | web/src/js/ducks/ui.js | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/web/src/js/components/FlowView.jsx b/web/src/js/components/FlowView.jsx index 1a04c915..5ba472a5 100644 --- a/web/src/js/components/FlowView.jsx +++ b/web/src/js/components/FlowView.jsx @@ -79,7 +79,7 @@ export default class FlowView extends Component { onSelectTab={this.props.selectTab} /> <Tab ref={ tab => this.tabComponent = tab } flow={flow} updateFlow={updateFlow} /> - {this.state.prompt && ( + {this.props.promptOpen && ( <Prompt options={this.getPromptOptions()} done={this.onPromptFinish} /> )} </div> @@ -89,7 +89,7 @@ export default class FlowView extends Component { export default connect( state => ({ - needEdit: state.ui.needEdit, + promptOpen: state.ui.promptOpen, }), { setPrompt, diff --git a/web/src/js/ducks/ui.js b/web/src/js/ducks/ui.js index 8fb5b735..15334f88 100644 --- a/web/src/js/ducks/ui.js +++ b/web/src/js/ducks/ui.js @@ -141,7 +141,13 @@ export function setDisplayLarge(displayLarge) { return { type: SET_DISPLAY_LARGE, displayLarge } } -export function onKeyDown(key, shiftKey) { +export function onKeyDown(e) { + if(e.ctrlKey) { + return () => {} + } + var key = e.keyCode + var shiftKey = e.shiftKey + e.preventDefault() return (dispatch, getState) => { switch (key) { @@ -252,6 +258,5 @@ export function onKeyDown(key, shiftKey) { default: return () => {} } - event.preventDefault() } } |