From aa6856786b32a3e4fb90e9471f24d90489e46dee Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 20 Sep 2014 00:25:40 +0200 Subject: web: minor fixes --- libmproxy/web/static/js/app.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libmproxy/web/static/js') diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js index 01c14ddc..b86e462a 100644 --- a/libmproxy/web/static/js/app.js +++ b/libmproxy/web/static/js/app.js @@ -690,13 +690,13 @@ var IconColumn = React.createClass({displayName: 'IconColumn', 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"; } } @@ -763,9 +763,11 @@ var SizeColumn = React.createClass({displayName: 'SizeColumn', }, 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 React.DOM.td({className: "col-size"}, size); } }); -- cgit v1.2.3