change way to edit

2 files changed, 10 insertions, 24 deletions

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index 221c6ace..cd01af22 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -2,7 +2,8 @@ import React, { PropTypes } from 'react'
 
 Button.propTypes = {
     onClick: PropTypes.func.isRequired,
-    text: PropTypes.string.isRequired
+    text: PropTypes.string,
+    icon: PropTypes.string
 }
 
 export default function Button({ onClick, text, icon, disabled }) {
@@ -10,11 +11,8 @@ export default function Button({ onClick, text, icon, disabled }) {
         <div className={"btn btn-default"}
              onClick={onClick}
              disabled={disabled}>
-            <span hidden={!icon}>
-                <i className={"fa fa-fw " + icon}/>
-                &nbsp;
-            </span>
-            {text}
+            {icon && (<i className={"fa fa-fw " + icon}/> )}
+            {text && text}
         </div>
     )
 }
diff --git a/web/src/js/components/common/CodeEditor.jsx b/web/src/js/components/common/CodeEditor.jsx
index 85da0507..b10b13ed 100644
--- a/web/src/js/components/common/CodeEditor.jsx
+++ b/web/src/js/components/common/CodeEditor.jsx
@@ -1,40 +1,28 @@
 import React, { Component, PropTypes } from 'react'
 import { render } from 'react-dom';
-import brace from 'brace';
 import AceEditor from 'react-ace';
-import Button from './Button'
-
 
 import 'brace/mode/javascript';
-import 'brace/mode/json';
 import 'brace/theme/kuroir';
 
-
-
-
 export default class CodeEditor extends Component{
-    constructor( props ) {
-        super(props)
-        this.state = {value: this.props.value}
-    }
-
-    onChange(newValue) {
-        this.setState({value: newValue})
+     static propTypes = {
+        value: PropTypes.string.isRequired,
+        onChange: PropTypes.func.isRequired,
     }
 
     render() {
         return (
             <div onKeyDown={e => e.stopPropagation()}>
                 <AceEditor
-                    onChange={e => this.onChange(e)}
                     mode="javascript"
                     theme="kuroir"
-                    value={this.state.value}
+                    onChange={this.props.onChange}
+                    name="rea"
+                    value={this.props.value}
                     width="100%"
-                    name="codeEditor"
                     editorProps={{$blockScrolling: Infinity}}
                 />
-                <Button onClick={(e) => this.props.onSave(this.state.value)} text="Update"/>
             </div>
         )
     }