diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-03-05 13:07:54 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 13:07:54 +0100 | 
| commit | 22154dee5c4ecec5eb9ef0fb1a2ce98fd0d39ecd (patch) | |
| tree | 7eaf274f553c1acd8d5eeabe34b67aa751372e02 | |
| parent | e0644398b62a312652c15569c0f530a27963dcf4 (diff) | |
| parent | 6a3497f09c260de63c85ec26d5a366a6c55e3e88 (diff) | |
| download | mitmproxy-22154dee5c4ecec5eb9ef0fb1a2ce98fd0d39ecd.tar.gz mitmproxy-22154dee5c4ecec5eb9ef0fb1a2ce98fd0d39ecd.tar.bz2 mitmproxy-22154dee5c4ecec5eb9ef0fb1a2ce98fd0d39ecd.zip | |
Merge pull request #2085 from MatthewShao/dev
[web] Add mouse support for FilterInput popover.
| -rw-r--r-- | web/src/css/header.less | 7 | ||||
| -rw-r--r-- | web/src/js/components/Header/FilterDocs.jsx | 2 | ||||
| -rw-r--r-- | web/src/js/components/Header/FilterInput.jsx | 8 | 
3 files changed, 15 insertions, 2 deletions
| diff --git a/web/src/css/header.less b/web/src/css/header.less index 042d6811..97c69930 100644 --- a/web/src/css/header.less +++ b/web/src/css/header.less @@ -113,5 +113,12 @@ header {      .popover-content {          max-height: 500px;          overflow-y: auto; + +        tr { +            cursor: pointer; +            &:hover { +                background-color: hsla(209, 52%, 84%, 0.5) !important; +            } +        }      }  } diff --git a/web/src/js/components/Header/FilterDocs.jsx b/web/src/js/components/Header/FilterDocs.jsx index 49fb5fbc..b471840b 100644 --- a/web/src/js/components/Header/FilterDocs.jsx +++ b/web/src/js/components/Header/FilterDocs.jsx @@ -37,7 +37,7 @@ export default class FilterDocs extends Component {              <table className="table table-condensed">                  <tbody>                      {doc.commands.map(cmd => ( -                        <tr key={cmd[1]}> +                        <tr key={cmd[1]} onClick={e => this.props.selectHandler(cmd[0].split(" ")[0] + " ")}>                              <td>{cmd[0].replace(' ', '\u00a0')}</td>                              <td>{cmd[1]}</td>                          </tr> diff --git a/web/src/js/components/Header/FilterInput.jsx b/web/src/js/components/Header/FilterInput.jsx index e421f1a4..12479c10 100644 --- a/web/src/js/components/Header/FilterInput.jsx +++ b/web/src/js/components/Header/FilterInput.jsx @@ -21,6 +21,7 @@ export default class FilterInput extends Component {          this.onKeyDown = this.onKeyDown.bind(this)          this.onMouseEnter = this.onMouseEnter.bind(this)          this.onMouseLeave = this.onMouseLeave.bind(this) +        this.selectFilter = this.selectFilter.bind(this)      }      componentWillReceiveProps(nextProps) { @@ -41,7 +42,7 @@ export default class FilterInput extends Component {      getDesc() {          if (!this.state.value) { -            return <FilterDocs/> +            return <FilterDocs selectHandler={this.selectFilter}/>          }          try {              return Filt.parse(this.state.value).desc @@ -85,6 +86,11 @@ export default class FilterInput extends Component {          e.stopPropagation()      } +    selectFilter(cmd) { +        this.setState({value: cmd}) +        ReactDOM.findDOMNode(this.refs.input).focus() +    } +      blur() {          ReactDOM.findDOMNode(this.refs.input).blur()      } | 
