aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/common
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-07-19 12:23:20 +0200
committerClemens <cle1000.cb@gmail.com>2016-07-19 12:23:20 +0200
commit48728af43ad746d70ef3e251dc28b75028dea1e6 (patch)
tree77b8b1eef4845c5bcc641d748435a32558c5d089 /web/src/js/components/common
parent87797d7ac07108ce5fd00902918e4900907b94b6 (diff)
downloadmitmproxy-48728af43ad746d70ef3e251dc28b75028dea1e6.tar.gz
mitmproxy-48728af43ad746d70ef3e251dc28b75028dea1e6.tar.bz2
mitmproxy-48728af43ad746d70ef3e251dc28b75028dea1e6.zip
moved flow editor state to redux
Diffstat (limited to 'web/src/js/components/common')
-rw-r--r--web/src/js/components/common/CodeEditor.jsx12
-rw-r--r--web/src/js/components/common/Splitter.jsx1
2 files changed, 11 insertions, 2 deletions
diff --git a/web/src/js/components/common/CodeEditor.jsx b/web/src/js/components/common/CodeEditor.jsx
index c122cf94..5b2305a8 100644
--- a/web/src/js/components/common/CodeEditor.jsx
+++ b/web/src/js/components/common/CodeEditor.jsx
@@ -5,17 +5,25 @@ import Codemirror from 'react-codemirror';
export default class CodeEditor extends Component{
static propTypes = {
- value: PropTypes.string.isRequired,
+ content: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,
}
+ constructor(props){
+ super(props)
+ }
+
+ componentWillMount(){
+ this.props.onChange(this.props.content)
+ }
+
render() {
let options = {
lineNumbers: true
};
return (
<div onKeyDown={e => e.stopPropagation()}>
- <Codemirror value={this.props.value} onChange={this.props.onChange} options={options}/>
+ <Codemirror value={this.props.content} onChange={this.props.onChange} options={options}/>
</div>
)
}
diff --git a/web/src/js/components/common/Splitter.jsx b/web/src/js/components/common/Splitter.jsx
index 9d22b6fd..bd4fb3d2 100644
--- a/web/src/js/components/common/Splitter.jsx
+++ b/web/src/js/components/common/Splitter.jsx
@@ -12,6 +12,7 @@ export default class Splitter extends Component {
this.state = { applied: false, startX: false, startY: false }
this.onMouseMove = this.onMouseMove.bind(this)
+ this.onMouseDown = this.onMouseDown.bind(this)
this.onMouseUp = this.onMouseUp.bind(this)
this.onDragEnd = this.onDragEnd.bind(this)
}