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

3 files changed, 9 insertions, 9 deletions

diff --git a/web/src/js/actions.js b/web/src/js/actions.js
index 87c99dd2..32c3c7c0 100644
--- a/web/src/js/actions.js
+++ b/web/src/js/actions.js
@@ -121,7 +121,7 @@ var FlowActions = {
 };
 
 var Query = {
-    FILTER: "f",
+    SEARCH: "s",
     HIGHLIGHT: "h",
     SHOW_EVENTLOG: "e"
 };
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"
diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 8f6989ae..2b7819c5 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -41,7 +41,7 @@ var MainView = React.createClass({
     },
     getViewFilt: function () {
         try {
-            var filt = Filt.parse(this.getQuery()[Query.FILTER] || "");
+            var filt = Filt.parse(this.getQuery()[Query.SEARCH] || "");
             var highlightStr = this.getQuery()[Query.HIGHLIGHT];
             var highlight = highlightStr ? Filt.parse(highlightStr) : false;
         } catch (e) {
@@ -57,7 +57,7 @@ var MainView = React.createClass({
         };
     },
     componentWillReceiveProps: function (nextProps) {
-        var filterChanged = (this.props.query[Query.FILTER] !== nextProps.query[Query.FILTER]);
+        var filterChanged = (this.props.query[Query.SEARCH] !== nextProps.query[Query.SEARCH]);
         var highlightChanged = (this.props.query[Query.HIGHLIGHT] !== nextProps.query[Query.HIGHLIGHT]);
         if (filterChanged || highlightChanged) {
             this.state.view.recalculate(this.getViewFilt(), this.state.sortKeyFun);