code -> status_code, httpversion -> http_version

4 files changed, 15 insertions, 15 deletions

diff --git a/web/src/js/components/flowtable-columns.js b/web/src/js/components/flowtable-columns.js
index b3b47910..74d96216 100644
--- a/web/src/js/components/flowtable-columns.js
+++ b/web/src/js/components/flowtable-columns.js
@@ -44,9 +44,9 @@ var IconColumn = React.createClass({
             var contentType = ResponseUtils.getContentType(flow.response);
 
             //TODO: We should assign a type to the flow somewhere else.
-            if (flow.response.code === 304) {
+            if (flow.response.status_code === 304) {
                 icon = "resource-icon-not-modified";
-            } else if (300 <= flow.response.code && flow.response.code < 400) {
+            } else if (300 <= flow.response.status_code && flow.response.status_code < 400) {
                 icon = "resource-icon-redirect";
             } else if (contentType && contentType.indexOf("image") >= 0) {
                 icon = "resource-icon-image";
@@ -118,14 +118,14 @@ var StatusColumn = React.createClass({
             }
         }),
         sortKeyFun: function(flow){
-            return flow.response ? flow.response.code : undefined;
+            return flow.response ? flow.response.status_code : undefined;
         }
     },
     render: function () {
         var flow = this.props.flow;
         var status;
         if (flow.response) {
-            status = flow.response.code;
+            status = flow.response.status_code;
         } else {
             status = null;
         }
@@ -198,4 +198,4 @@ var all_columns = [
     TimeColumn
 ];
 
-module.exports = all_columns;
\ No newline at end of file
+module.exports = all_columns;
diff --git a/web/src/js/components/flowview/messages.js b/web/src/js/components/flowview/messages.js
index 8879e753..7ac95d85 100644
--- a/web/src/js/components/flowview/messages.js
+++ b/web/src/js/components/flowview/messages.js
@@ -121,7 +121,7 @@ var RequestLine = React.createClass({
     render: function () {
         var flow = this.props.flow;
         var url = flowutils.RequestUtils.pretty_url(flow.request);
-        var httpver = flow.request.httpversion;
+        var httpver = flow.request.http_version;
 
         return <div className="first-line request-line">
             <ValueEditor
@@ -167,7 +167,7 @@ var RequestLine = React.createClass({
         var ver = flowutils.parseHttpVersion(nextVer);
         actions.FlowActions.update(
             this.props.flow,
-            {request: {httpversion: ver}}
+            {request: {http_version: ver}}
         );
     }
 });
@@ -175,7 +175,7 @@ var RequestLine = React.createClass({
 var ResponseLine = React.createClass({
     render: function () {
         var flow = this.props.flow;
-        var httpver = flow.response.httpversion;
+        var httpver = flow.response.http_version;
         return <div className="first-line response-line">
             <ValueEditor
                 ref="httpVersion"
@@ -186,7 +186,7 @@ var ResponseLine = React.createClass({
         &nbsp;
             <ValueEditor
                 ref="code"
-                content={flow.response.code + ""}
+                content={flow.response.status_code + ""}
                 onDone={this.onCodeChange}
                 isValid={this.isValidCode}
                 inline/>
@@ -205,7 +205,7 @@ var ResponseLine = React.createClass({
         var ver = flowutils.parseHttpVersion(nextVer);
         actions.FlowActions.update(
             this.props.flow,
-            {response: {httpversion: ver}}
+            {response: {http_version: ver}}
         );
     },
     onMsgChange: function (nextMsg) {
@@ -279,7 +279,7 @@ var Response = React.createClass({
     edit: function (k) {
         switch (k) {
             case "c":
-                this.refs.responseLine.refs.code.focus();
+                this.refs.responseLine.refs.status_code.focus();
                 break;
             case "m":
                 this.refs.responseLine.refs.msg.focus();
diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js
index 78d6a67c..02a04c66 100644
--- a/web/src/js/filt/filt.js
+++ b/web/src/js/filt/filt.js
@@ -1654,7 +1654,7 @@ module.exports = (function() {
     assetFilter.desc = "is asset";
     function responseCode(code){
         function responseCodeFilter(flow){
-            return flow.response && flow.response.code === code;
+            return flow.response && flow.response.status_code === code;
         }
         responseCodeFilter.desc = "resp. code is " + code;
         return responseCodeFilter;
@@ -1771,4 +1771,4 @@ module.exports = (function() {
     SyntaxError: SyntaxError,
     parse:       parse
   };
-})();
\ No newline at end of file
+})();
diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg
index b4763ccf..6f9bdac6 100644
--- a/web/src/js/filt/filt.peg
+++ b/web/src/js/filt/filt.peg
@@ -64,7 +64,7 @@ function assetFilter(flow) {
 assetFilter.desc = "is asset";
 function responseCode(code){
     function responseCodeFilter(flow){
-        return flow.response && flow.response.code === code;
+        return flow.response && flow.response.status_code === code;
     }
     responseCodeFilter.desc = "resp. code is " + code;
     return responseCodeFilter;
@@ -246,4 +246,4 @@ EscapeSequence
   = ['"\\]
   / "n" { return "\n"; }
   / "r" { return "\r"; }
-  / "t" { return "\t"; }
\ No newline at end of file
+  / "t" { return "\t"; }