From ac5d74d42c0824b5789cc030bf39a447951e4804 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 21 Mar 2015 21:55:02 +0100 Subject: web: fix bugs --- web/src/js/components/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index d1684fb2..eca06e74 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -173,7 +173,7 @@ var MainMenu = React.createClass({ this.setQuery(d); }, onInterceptChange: function (val) { - SettingsActions.update({intercept: val}); + actions.SettingsActions.update({intercept: val}); }, render: function () { var filter = this.getQuery()[Query.FILTER] || ""; -- cgit v1.2.3 From cf9f91b0b4abe2020c544981d6dc2e2e85f4b4bd Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 22 Mar 2015 14:33:42 +0100 Subject: web: upgrade to react 0.13 --- web/src/js/components/header.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index eca06e74..dcfdd2ae 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -356,15 +356,17 @@ var Header = React.createClass({ }, render: function () { var header = header_entries.map(function (entry, i) { - var classes = React.addons.classSet({ - active: entry == this.state.active - }); + var className; + if(entry === this.state.active){ + className = "active"; + } else { + className = ""; + } return ( + className={className} + onClick={this.handleClick.bind(this, entry)}> { entry.title} ); -- cgit v1.2.3 From 1913975fa60c76bfb7e79a908b18e7e93793f71f Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 27 Mar 2015 21:58:04 +0100 Subject: web: use contexts to pass down stores. Using contexts frees us from the contracts we have using props - namely, we can assume them to be constant for the lifetime of the object. --- web/src/js/components/header.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index dcfdd2ae..b2934df6 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -157,7 +157,7 @@ var FilterInput = React.createClass({ }); var MainMenu = React.createClass({ - mixins: [common.Navigation, common.State], + mixins: [common.Navigation, common.RouterState, common.SettingsState], statics: { title: "Start", route: "flows" @@ -178,7 +178,7 @@ var MainMenu = React.createClass({ render: function () { var filter = this.getQuery()[Query.FILTER] || ""; var highlight = this.getQuery()[Query.HIGHLIGHT] || ""; - var intercept = this.props.settings.intercept || ""; + var intercept = this.state.settings.intercept || ""; return (
@@ -214,7 +214,7 @@ var ViewMenu = React.createClass({ title: "View", route: "flows" }, - mixins: [common.Navigation, common.State], + mixins: [common.Navigation, common.RouterState], toggleEventLog: function () { var d = {}; @@ -379,7 +379,7 @@ var Header = React.createClass({ {header}
- +
); @@ -389,4 +389,4 @@ var Header = React.createClass({ module.exports = { Header: Header -} \ No newline at end of file +}; \ No newline at end of file -- cgit v1.2.3 From 93d1d0416d6b48506e4579456ad3d7cd9dbd3e91 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 29 Mar 2015 03:24:03 +0200 Subject: web: add more keyboard shortcuts --- web/src/js/components/header.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index b2934df6..0452af3f 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -50,6 +50,7 @@ var FilterDocs = React.createClass({ } }); var FilterInput = React.createClass({ + mixins: [common.ChildFocus], getInitialState: function () { // Consider both focus and mouseover for showing/hiding the tooltip, // because onBlur of the input is triggered before the click on the tooltip @@ -114,11 +115,13 @@ var FilterInput = React.createClass({ // If closed using ESC/ENTER, hide the tooltip. this.setState({mousefocus: false}); } + e.stopPropagation(); }, blur: function () { this.refs.input.getDOMNode().blur(); + this.context.returnFocus && this.context.returnFocus(); }, - focus: function () { + select: function () { this.refs.input.getDOMNode().select(); }, render: function () { @@ -184,18 +187,21 @@ var MainMenu = React.createClass({
- +
); @@ -388,5 +394,6 @@ var Header = React.createClass({ module.exports = { - Header: Header + Header: Header, + MainMenu: MainMenu }; \ No newline at end of file -- cgit v1.2.3 From 737002921e9aed701afb49fda8777e8c9286bf09 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 30 Mar 2015 00:46:33 +0200 Subject: s/filter/search/ no matter what we agree on in #542, this needs to be done anyway. --- web/src/js/components/header.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'web/src/js/components/header.js') 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({
Date: Mon, 30 Mar 2015 03:49:50 +0200 Subject: web: add prompt for keyboard navigation --- web/src/js/components/header.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index 6cd1006d..225f5b9f 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -165,7 +165,7 @@ var MainMenu = React.createClass({ title: "Start", route: "flows" }, - onFilterChange: function (val) { + onSearchChange: function (val) { var d = {}; d[Query.SEARCH] = val; this.setQuery(d); @@ -192,7 +192,7 @@ var MainMenu = React.createClass({ type="search" color="black" value={search} - onChange={this.onFilterChange} /> + onChange={this.onSearchChange} /> Date: Fri, 1 May 2015 17:24:44 +0200 Subject: mitmweb: add editor --- web/src/js/components/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/src/js/components/header.js') diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js index 225f5b9f..998a41df 100644 --- a/web/src/js/components/header.js +++ b/web/src/js/components/header.js @@ -119,7 +119,7 @@ var FilterInput = React.createClass({ }, blur: function () { this.refs.input.getDOMNode().blur(); - this.context.returnFocus && this.context.returnFocus(); + this.returnFocus(); }, select: function () { this.refs.input.getDOMNode().select(); -- cgit v1.2.3