aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-20 00:25:40 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-20 00:25:40 +0200
commitaa6856786b32a3e4fb90e9471f24d90489e46dee (patch)
tree2e7ed3609c08a74941c1561dd95436928009bd06 /web
parent818c5918b648b29f3692bd2cc6ebcf326d4d2497 (diff)
downloadmitmproxy-aa6856786b32a3e4fb90e9471f24d90489e46dee.tar.gz
mitmproxy-aa6856786b32a3e4fb90e9471f24d90489e46dee.tar.bz2
mitmproxy-aa6856786b32a3e4fb90e9471f24d90489e46dee.zip
web: minor fixes
Diffstat (limited to 'web')
-rw-r--r--web/src/js/components/flowtable-columns.jsx.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/web/src/js/components/flowtable-columns.jsx.js b/web/src/js/components/flowtable-columns.jsx.js
index 728bc953..ec63b03f 100644
--- a/web/src/js/components/flowtable-columns.jsx.js
+++ b/web/src/js/components/flowtable-columns.jsx.js
@@ -39,13 +39,13 @@ var IconColumn = React.createClass({
icon = "resource-icon-not-modified";
} else if(300 <= flow.response.code && flow.response.code < 400) {
icon = "resource-icon-redirect";
- } else if(contentType.indexOf("image") >= 0) {
+ } else if(contentType && contentType.indexOf("image") >= 0) {
icon = "resource-icon-image";
- } else if (contentType.indexOf("javascript") >= 0) {
+ } else if (contentType && contentType.indexOf("javascript") >= 0) {
icon = "resource-icon-js";
- } else if (contentType.indexOf("css") >= 0) {
+ } else if (contentType && contentType.indexOf("css") >= 0) {
icon = "resource-icon-css";
- } else if (contentType.indexOf("html") >= 0) {
+ } else if (contentType && contentType.indexOf("html") >= 0) {
icon = "resource-icon-document";
}
}
@@ -112,9 +112,11 @@ var SizeColumn = React.createClass({
},
render: function(){
var flow = this.props.flow;
- var size = formatSize(
- flow.request.contentLength +
- (flow.response.contentLength || 0));
+ var total = flow.request.contentLength;
+ if(flow.response){
+ total += flow.response.contentLength;
+ }
+ var size = formatSize(total);
return <td className="col-size">{size}</td>;
}
});