aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-07-25 09:05:24 +0200
committerClemens <cle1000.cb@gmail.com>2016-07-25 09:05:24 +0200
commit0aedea6e60f22f78f3523b860027550159ba6dd8 (patch)
tree8e630e17d54341aa5d457c3917044221563eb5b3 /web/src/js/components
parentf578bf512248c609296d2ff0ea2007a6feac561f (diff)
downloadmitmproxy-0aedea6e60f22f78f3523b860027550159ba6dd8.tar.gz
mitmproxy-0aedea6e60f22f78f3523b860027550159ba6dd8.tar.bz2
mitmproxy-0aedea6e60f22f78f3523b860027550159ba6dd8.zip
remove lastFileUpload field
Diffstat (limited to 'web/src/js/components')
-rw-r--r--web/src/js/components/ContentView.jsx9
-rw-r--r--web/src/js/components/ContentView/ContentViews.jsx4
-rw-r--r--web/src/js/components/FlowView/Messages.jsx5
3 files changed, 9 insertions, 9 deletions
diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx
index 7c8ac510..e88d1ce2 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, lastFileUpload, uploadContent, onContentChange, content, readonly } = props
+ const { flow, message, contentView, selectView, displayLarge, setDisplayLarge, uploadContent, onContentChange, content, readonly } = props
if (message.contentLength === 0) {
return <MetaViews.ContentEmpty {...props}/>
@@ -36,11 +36,11 @@ function ContentView(props) {
return (
<div>
{View.textView ? (
- <ContentLoader flow={flow} lastFileUpload={lastFileUpload} readonly={readonly} message={message}>
+ <ContentLoader flow={flow} readonly={readonly} message={message}>
<View readonly={readonly} onChange={onContentChange} content="" />
</ContentLoader>
) : (
- <View flow={flow} lastFileUpload={lastFileUpload} readonly={readonly} content={content} message={message} />
+ <View flow={flow} readonly={readonly} content={content} message={message} />
)}
<div className="view-options text-center">
<ViewSelector onSelectView={selectView} active={View} message={message}/>
@@ -72,11 +72,10 @@ export default connect(
state => ({
contentView: state.ui.flow.contentView,
displayLarge: state.ui.flow.displayLarge,
- lastFileUpload: state.ui.flow.lastFileUpload
}),
{
selectView: setContentView,
displayLarge,
- updateEdit,
+ updateEdit
}
)(ContentView)
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 4ae6044b..6c7f4900 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -60,10 +60,10 @@ ViewAuto.propTypes = {
flow: React.PropTypes.object.isRequired,
}
-export function ViewAuto({ message, flow, readonly, lastFileUpload }) {
+export function ViewAuto({ message, flow, readonly }) {
const View = ViewAuto.findView(message)
if (View.textView) {
- return <ContentLoader message={message} lastFileUpload={lastFileUpload} flow={flow}><View readonly={readonly} content="" /></ContentLoader>
+ return <ContentLoader message={message} flow={flow}><View readonly={readonly} content="" /></ContentLoader>
} else {
return <View readonly={readonly} message={message} flow={flow} />
}
diff --git a/web/src/js/components/FlowView/Messages.jsx b/web/src/js/components/FlowView/Messages.jsx
index a3beaf84..9de25b5b 100644
--- a/web/src/js/components/FlowView/Messages.jsx
+++ b/web/src/js/components/FlowView/Messages.jsx
@@ -9,7 +9,8 @@ import ValidateEditor from '../ValueEditor/ValidateEditor'
import ValueEditor from '../ValueEditor/ValueEditor'
import Headers from './Headers'
-import { startEdit, updateEdit, uploadContent } from '../../ducks/ui/flow'
+import { startEdit, updateEdit } from '../../ducks/ui/flow'
+import * as FlowActions from '../../ducks/flows'
import ToggleEdit from './ToggleEdit'
function RequestLine({ flow, readonly, updateFlow }) {
@@ -73,7 +74,7 @@ const Message = connect(
}),
{
updateFlow: updateEdit,
- uploadContent: uploadContent
+ uploadContent: FlowActions.uploadContent
}
)