aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/ContentView.jsx
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-04-27 18:29:57 +0200
committerGitHub <noreply@github.com>2017-04-27 18:29:57 +0200
commit5f91b7a45d0b983d3e0f3fff1be8af93736d35c6 (patch)
tree8a30076396d7564d458930a46a709083a3400520 /web/src/js/components/ContentView.jsx
parent2a46f3851a468263b53298b643f92a36b713128e (diff)
parent115a31c9baff9907694c9f1d8c53dcc1e9fbb664 (diff)
downloadmitmproxy-5f91b7a45d0b983d3e0f3fff1be8af93736d35c6.tar.gz
mitmproxy-5f91b7a45d0b983d3e0f3fff1be8af93736d35c6.tar.bz2
mitmproxy-5f91b7a45d0b983d3e0f3fff1be8af93736d35c6.zip
Merge pull request #2275 from mitmproxy/mitmweb-change-react-prop-types
change import of prop-types
Diffstat (limited to 'web/src/js/components/ContentView.jsx')
-rw-r--r--web/src/js/components/ContentView.jsx7
1 files changed, 4 insertions, 3 deletions
diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx
index 398438ab..a79bf9e5 100644
--- a/web/src/js/components/ContentView.jsx
+++ b/web/src/js/components/ContentView.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import * as ContentViews from './ContentView/ContentViews'
import * as MetaViews from './ContentView/MetaViews'
@@ -11,8 +12,8 @@ ContentView.propTypes = {
// It may seem a bit weird at the first glance:
// Every view takes the flow and the message as props, e.g.
// <Auto flow={flow} message={flow.request}/>
- flow: React.PropTypes.object.isRequired,
- message: React.PropTypes.object.isRequired,
+ flow: PropTypes.object.isRequired,
+ message: PropTypes.object.isRequired,
}
ContentView.isContentTooLarge = msg => msg.contentLength > 1024 * 1024 * (ContentViews.ViewImage.matches(msg) ? 10 : 0.2)