aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/ContentView/ContentViews.jsx
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-11-23 22:47:50 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-11-23 22:47:50 +0100
commit222106916e8c57ed9ab83f7c0c8d8a76d53ab298 (patch)
tree743898632b9f2b1d83d8a05a6725ab3311ae3ca9 /web/src/js/components/ContentView/ContentViews.jsx
parentd15ddfad14052b7fd971f3b82bbb86e7ec39c40b (diff)
parent45332006a3da246679e6043b4abee06cd3ba0636 (diff)
downloadmitmproxy-222106916e8c57ed9ab83f7c0c8d8a76d53ab298.tar.gz
mitmproxy-222106916e8c57ed9ab83f7c0c8d8a76d53ab298.tar.bz2
mitmproxy-222106916e8c57ed9ab83f7c0c8d8a76d53ab298.zip
Merge branch 'mitmweb-eventlog'
Diffstat (limited to 'web/src/js/components/ContentView/ContentViews.jsx')
-rw-r--r--web/src/js/components/ContentView/ContentViews.jsx4
1 files changed, 1 insertions, 3 deletions
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 32a07564..db239195 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -63,6 +63,7 @@ class ViewServer extends Component {
let lines = this.props.showFullContent ? this.data.lines : this.data.lines.slice(0, maxLines)
return (
<div>
+ {ViewImage.matches(message) && <ViewImage {...this.props} />}
<pre>
{lines.map((line, i) =>
<div key={`line${i}`}>
@@ -77,9 +78,6 @@ class ViewServer extends Component {
</div>
)}
</pre>
- {ViewImage.matches(message) &&
- <ViewImage {...this.props} />
- }
</div>
)
}