diff options
author | Clemens <cle1000.cb@gmail.com> | 2016-07-22 19:07:53 +0200 |
---|---|---|
committer | Clemens <cle1000.cb@gmail.com> | 2016-07-22 19:07:53 +0200 |
commit | f578bf512248c609296d2ff0ea2007a6feac561f (patch) | |
tree | 7c58f14f09df0699cc788cde84e60b76d5f863e3 /web/src/js/components/ContentView.jsx | |
parent | 70ca10b423de4a57a395798aa94189ba4da7840f (diff) | |
download | mitmproxy-f578bf512248c609296d2ff0ea2007a6feac561f.tar.gz mitmproxy-f578bf512248c609296d2ff0ea2007a6feac561f.tar.bz2 mitmproxy-f578bf512248c609296d2ff0ea2007a6feac561f.zip |
file upload updates contentview, editable contentloader, diffs on upload
Diffstat (limited to 'web/src/js/components/ContentView.jsx')
-rw-r--r-- | web/src/js/components/ContentView.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx index 06272627..7c8ac510 100644 --- a/web/src/js/components/ContentView.jsx +++ b/web/src/js/components/ContentView.jsx @@ -18,7 +18,7 @@ ContentView.propTypes = { ContentView.isContentTooLarge = msg => msg.contentLength > 1024 * 1024 * (ContentViews.ViewImage.matches(msg) ? 10 : 0.2) function ContentView(props) { - const { flow, message, contentView, selectView, displayLarge, setDisplayLarge, uploadContent, onContentChange, readonly } = props + const { flow, message, contentView, selectView, displayLarge, setDisplayLarge, lastFileUpload, uploadContent, onContentChange, content, readonly } = props if (message.contentLength === 0) { return <MetaViews.ContentEmpty {...props}/> @@ -33,15 +33,14 @@ function ContentView(props) { } const View = ContentViews[contentView] - return ( <div> {View.textView ? ( - <ContentLoader flow={flow} message={message}> + <ContentLoader flow={flow} lastFileUpload={lastFileUpload} readonly={readonly} message={message}> <View readonly={readonly} onChange={onContentChange} content="" /> </ContentLoader> ) : ( - <View flow={flow} readonly={readonly} message={message} /> + <View flow={flow} lastFileUpload={lastFileUpload} readonly={readonly} content={content} message={message} /> )} <div className="view-options text-center"> <ViewSelector onSelectView={selectView} active={View} message={message}/> @@ -73,6 +72,7 @@ export default connect( state => ({ contentView: state.ui.flow.contentView, displayLarge: state.ui.flow.displayLarge, + lastFileUpload: state.ui.flow.lastFileUpload }), { selectView: setContentView, |