Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy

1 files changed, 6 insertions, 6 deletions

diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js
index 0452af3f..6cd1006d 100644
--- a/web/src/js/components/header.js
+++ b/web/src/js/components/header.js
@@ -167,7 +167,7 @@ var MainMenu = React.createClass({
     },
     onFilterChange: function (val) {
         var d = {};
-        d[Query.FILTER] = val;
+        d[Query.SEARCH] = val;
         this.setQuery(d);
     },
     onHighlightChange: function (val) {
@@ -179,7 +179,7 @@ var MainMenu = React.createClass({
         actions.SettingsActions.update({intercept: val});
     },
     render: function () {
-        var filter = this.getQuery()[Query.FILTER] || "";
+        var search = this.getQuery()[Query.SEARCH] || "";
         var highlight = this.getQuery()[Query.HIGHLIGHT] || "";
         var intercept = this.state.settings.intercept || "";
 
@@ -187,11 +187,11 @@ var MainMenu = React.createClass({
             <div>
                 <div className="menu-row">
                     <FilterInput
-                        ref="filter"
-                        placeholder="Filter"
-                        type="filter"
+                        ref="search"
+                        placeholder="Search"
+                        type="search"
                         color="black"
-                        value={filter}
+                        value={search}
                         onChange={this.onFilterChange} />
                     <FilterInput
                         ref="highlight"