diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /web/src/js/components/ContentView | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'web/src/js/components/ContentView')
| -rw-r--r-- | web/src/js/components/ContentView/MetaViews.jsx | 2 | ||||
| -rw-r--r-- | web/src/js/components/ContentView/ViewSelector.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/src/js/components/ContentView/MetaViews.jsx b/web/src/js/components/ContentView/MetaViews.jsx index 83720a13..2d064b54 100644 --- a/web/src/js/components/ContentView/MetaViews.jsx +++ b/web/src/js/components/ContentView/MetaViews.jsx @@ -1,5 +1,5 @@ import React from 'react' -import {formatSize} from '../../utils.js' +import { formatSize } from '../../utils.js' export function ContentEmpty({ flow, message }) { return ( diff --git a/web/src/js/components/ContentView/ViewSelector.jsx b/web/src/js/components/ContentView/ViewSelector.jsx index df3a5b83..9b151a5b 100644 --- a/web/src/js/components/ContentView/ViewSelector.jsx +++ b/web/src/js/components/ContentView/ViewSelector.jsx @@ -14,7 +14,7 @@ export default function ViewSelector({ active, message, onSelectView }) { {views.map(View => ( <button key={View.name} - onClick={() => onSelectView(View)} + onClick={() => onSelectView(View.name)} className={classnames('btn btn-default', { active: View === active })}> {View === ViewAuto ? ( `auto: ${ViewAuto.findView(message).name.toLowerCase().replace('view', '')}` |