aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-18 03:56:35 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-18 03:56:35 +0200
commit01da54f1c306a5d595046bd39bf2be8bbc86c132 (patch)
tree0fe4020e2b558a567f64787ca6c282954f1fe7f2
parent0d64cc93278d39bd4c87cf5110d326f57574c8a1 (diff)
downloadmitmproxy-01da54f1c306a5d595046bd39bf2be8bbc86c132.tar.gz
mitmproxy-01da54f1c306a5d595046bd39bf2be8bbc86c132.tar.bz2
mitmproxy-01da54f1c306a5d595046bd39bf2be8bbc86c132.zip
fix #361
-rw-r--r--libmproxy/console/flowview.py9
-rw-r--r--libmproxy/web/static/js/app.js2
-rw-r--r--web/src/js/components/flowtable.jsx.js2
3 files changed, 5 insertions, 8 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 014d44c0..b2c46147 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -176,12 +176,9 @@ class FlowView(common.WWrap):
key = "header",
val = "text"
)
- if conn.content is not None:
- override = self.override_get()
- viewmode = self.viewmode_get(override)
- msg, body = self.cont_view_handle_missing(conn, viewmode)
- elif conn.content == CONTENT_MISSING:
- pass
+ override = self.override_get()
+ viewmode = self.viewmode_get(override)
+ msg, body = self.cont_view_handle_missing(conn, viewmode)
return headers, msg, body
def conn_text_merge(self, headers, msg, body):
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
index 9c184e50..08d02cc9 100644
--- a/libmproxy/web/static/js/app.js
+++ b/libmproxy/web/static/js/app.js
@@ -582,7 +582,7 @@ var FlowTableHead = React.createClass({displayName: 'FlowTableHead',
var columns = this.props.columns.map(function(column){
return column.renderTitle();
}.bind(this));
- return React.DOM.thead(null, columns);
+ return React.DOM.thead(null, React.DOM.tr(null, columns));
}
});
diff --git a/web/src/js/components/flowtable.jsx.js b/web/src/js/components/flowtable.jsx.js
index b1b6fa98..e0c285da 100644
--- a/web/src/js/components/flowtable.jsx.js
+++ b/web/src/js/components/flowtable.jsx.js
@@ -25,7 +25,7 @@ var FlowTableHead = React.createClass({
var columns = this.props.columns.map(function(column){
return column.renderTitle();
}.bind(this));
- return <thead>{columns}</thead>;
+ return <thead><tr>{columns}</tr></thead>;
}
});