aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/ContentView
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-07-21 19:13:16 +0200
committerClemens <cle1000.cb@gmail.com>2016-07-21 19:13:16 +0200
commit70ca10b423de4a57a395798aa94189ba4da7840f (patch)
tree01354626e1060370b696f8271350f2e03cd560fd /web/src/js/components/ContentView
parent61f192434fade43af81dc74602aef218d5c5be19 (diff)
downloadmitmproxy-70ca10b423de4a57a395798aa94189ba4da7840f.tar.gz
mitmproxy-70ca10b423de4a57a395798aa94189ba4da7840f.tar.bz2
mitmproxy-70ca10b423de4a57a395798aa94189ba4da7840f.zip
moved editor to raw_view mode, add content_file_upload
Diffstat (limited to 'web/src/js/components/ContentView')
-rw-r--r--web/src/js/components/ContentView/ContentViews.jsx11
1 files changed, 5 insertions, 6 deletions
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 0eaf3ea8..6c7f4900 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -29,9 +29,8 @@ ViewRaw.propTypes = {
content: React.PropTypes.string.isRequired,
}
-export function ViewRaw({ content, isFlowEditorOpen, readonly }) {
- let showEditor = isFlowEditorOpen && !readonly
- return showEditor ? <CodeEditor content={content} onChange={content =>alert(content)}/> : <pre>{content}</pre>
+export function ViewRaw({ content, readonly, onChange }) {
+ return readonly ? <pre>{content}</pre> : <CodeEditor content={content} onChange={onChange}/>
}
ViewJSON.textView = true
@@ -61,12 +60,12 @@ ViewAuto.propTypes = {
flow: React.PropTypes.object.isRequired,
}
-export function ViewAuto({ message, flow }) {
+export function ViewAuto({ message, flow, readonly }) {
const View = ViewAuto.findView(message)
if (View.textView) {
- return <ContentLoader message={message} flow={flow}><View content="" /></ContentLoader>
+ return <ContentLoader message={message} flow={flow}><View readonly={readonly} content="" /></ContentLoader>
} else {
- return <View message={message} flow={flow} />
+ return <View readonly={readonly} message={message} flow={flow} />
}
}