s/filter/search/

no matter what we agree on in mitmproxy#542, this needs to be done anyway.
aGHz · Mar 29, 2015 · 7370029 · 7370029
1 parent a32698f
commit 7370029
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/libmproxy/web/static/app.js b/libmproxy/web/static/app.js
diff --git 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
@@ -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,19 +179,19 @@ 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 || "";
 
  return (
  <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
@@ -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);